Settings: NL translation

Add support to enable/disable Electron Beam

ps2: add an AlertDialog before to delete APN to avoid fails

ps3: fix \' misstake

ps4: Permit home button wake to be configurable

ps5/6: Add triggers to change profile based on AP

ps7: Rename 'Power sounds' to 'Charging sounds' and add summary

ps8: Shorten clumsy and repetitive gesture strings
     Remove triggers added in ps5/6 so we can merge this faster

ps9: Add bluetooth triggers to profiles
     Re-add triggers removed in ps8

Change-Id: Ic771d10c42b2650612890419122ca177878f39e7
Settings: PT-BR update translations

Change-Id: I8558988e100b56bf612bc80d7572c7bdb1c94ffd
Settings: RU translation

Change-Id: I36c20600032968c1bdd08fc63d1e7f22b82b8d42

Patch Set 2: Update translation

Change-Id: I8c55e248d54b9d18f956b09366e1473e4a177201

Patch Set 3: Update translation

Change-Id: I064bcf0e8fbc785559ad3ca7e70dc1a805bdc04f

Patch Set 4: Update translation

Change-Id: Ib2d79a391c58b7c2d6557e0d6789a32d87172773

Patch Set 6: Update translation

Change-Id: I8e2fdc5e50cd8d5b9c7e71cf9fc25ba7b8b714df
Settings: HU translation update

Change-Id: I2548daca04065877b705ea0c59541047851ef734
Merge "Settings: RU translation" into cm-10.1
Merge "Settings: PT-BR update translations" into cm-10.1
Settings: ES translations

- PrivacyGuard

Change-Id: Id531c7549a934023c5c5f47f6052aaaf3a7a12c7
Merge "Settings: NL translation" into cm-10.1
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
privacy guard: Fix crash when uninstalling an app

 * Don't try to update the privacy guard flag while refreshing after an
   uninstall since the PM will throw an exception at us.

Change-Id: Idadb99fefc2861e871f6206b08c844dda742fa68
Merge "QuickSettings: Camera tile" into cm-10.1
Merge "Add 2G/3G option to profile connections (2/2)" into cm-10.1
Merge branch 'cm-10.1' of git://github.com/CyanogenMod/android_packages_apps_Settings into cm-10.1-n7

Conflicts:
	res/values-pt/cm_strings.xml
	res/values-ru/cm_strings.xml
Revert "privacy guard: Fix crash when uninstalling an app"

This reverts commit 1ea6dc4eae311f75a0a63dd06c55dad156eb3d78.