frameworks_base : translation

- add "product" attribute

Change-Id: Ia4dcc1244d6984a93242a177e24a7099684cb72e
Bye, bye Talk. Welcome Hangouts (1/2)

Patchset  #2: Vector icons.

Change-Id: Ief201d9f0c80bca3c8d37fdf3283cbbb15004b5b
profiles: Don't broadcast before boot completed

 * Fix exception during boot.

Change-Id: I53850f55d3252ff2d16e1c98878ba24a074131e7
Merge "frameworks_base : translation" into cm-10.1
Merge "profiles: Don't broadcast before boot completed" into cm-10.1
Merge "Bye, bye Talk. Welcome Hangouts (1/2)" into cm-10.1
NFC polling mode (3/3)

Change-Id: Ia03413578d47e7cd0ffb3080778b6a1154cfc651

Conflicts:
	core/java/android/provider/Settings.java