QuickSettings: Camera tile

Change-Id: I8de198c6144e1b0194ebeaffffec084035492635
Add 2G/3G option to profile connections (2/2)

Only show option when network type is GSM not CDMA

Change-Id: Ib225366c63ae928f23afd5bbe8b5f68818a4976b
Merge "QuickSettings: Camera tile" into cm-10.1
Merge "Add 2G/3G option to profile connections (2/2)" into cm-10.1
Settings: PT-BR update translations

Change-Id: I5a6a67e1410ed31b1f50da9e801113f132364454
Settings: RU translations

Change-Id: If6b8c82e5749a06fadd891c1aab8ec56d9fd8a35
Merge "Settings: PT-BR update translations" into cm-10.1
Settings: HU translation

Change-Id: If766b9651ac132191afb9f66df9482f8851db035
Merge "Settings: HU translation" into cm-10.1
Handle cancellation of the 'enabling PrivacyGuard' alert box.

I noticed that the option could remain ticked but not actually enabled
if the alert box is cancelled.

Change-Id: If9a4e88641a5e4283d6ea16c17ca4461841580e3
Settings: Update italian translation

	Add Privacy Guard and profile triggers
	to italian translation

Change-Id: I5dd10431872085a769bc692e27b2ab8a3e9b626b
Settings : FR translation

-Add new translation
Patch set 2 : rebase and add new translation
Patch set 3 : rebase and add new translation
Patch set 4 : rebase and add new translation
Patch set 5 : rebase and add new translation

Change-Id: I5ffd8d73a47e1b9df5629875021aea992ed9d8b3
Settings: ES translations

Change-Id: If2d8a7bc620ae25a9d922c392413526e6e7ac36f
Merge "Settings: ES translations" into cm-10.1
Merge "Settings : FR translation" into cm-10.1
Merge "Handle cancellation of the 'enabling PrivacyGuard' alert box." into cm-10.1
Fix derp.

Change-Id: I2766f4c89460c967e32349be008e38b3600b7e76
merge changes from remotes/github/cm-10.1 into master
HALO: Option to pause the underlying app (2/2)

- adds an option to pause the active app when using HALO
- this is enabled by default for devices with low memory
- (currently: <640MB RAM available to the kernel)

Conflicts:
	res/values/strings.xml
	res/xml/tool_bar_settings.xml
	src/com/android/settings/paranoid/Toolbar.java

Change-Id: Ia86e5e34ad673799bec28f1de716dce6400d3f6e
Add option to hide music controls in lockscreen.

Change-Id: I736df60139f1b977838c16136c0c30198633fcb2