Completely remove app ops activity.

Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Import translations. DO NOT MERGE

Change-Id: I0f107b738c6aa5f0aeb538ccf991f64fac47fd5c
Auto-generated-cl: translation import
Use ConnectivityManager for mobile provision url

bug:9623159
Change-Id: I36697ed341353b7a3dbec5afe20241102e76f6f1
Merge "Use ConnectivityManager for mobile provision url" into jb-mr2-dev
Import translations. DO NOT MERGE

Change-Id: I09a9a2433e7be85d771059ecd1c4a514a3f61371
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I2f0dc917cd2d67b4478f74d0e2dccec53eb9f921
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: Iddc12747b1f57abb0a10f452b551332e86d2ba3c
Auto-generated-cl: translation import
Import translations. DO NOT MERGE

Change-Id: I5ab9317a61cf7adb7c911ac19770e9ae7d4f935b
Auto-generated-cl: translation import
Merge "Completely remove app ops activity." into jb-mr2-dev
Revert "Completely remove app ops activity."

This reverts commit 1ad26e9c370e3db3ac801bda42b3fa52ab2e2d07.

Change-Id: I58b5ea280ed0dbff00f7f6f98fbd41575cdd5222
Merge "Revert "Completely remove app ops activity."" into jb-mr2-dev
Completely remove app ops activity.

Change-Id: Ibe2f15c9ff7589fd5527a0f249d7c1eeca868c8a
Reconcile with AOSP jb-mr2-dev - do not merge
Reset app preferences now resets all app ops.

Change-Id: I7966245b5f322f55e139b2da661c02cd58530f11
Use MOBILE_PROVISIONING_ACTION for manage mobile plan.

Bug: 10328264
Change-Id: I3925004011bb1243793c4c1b963d923dc2b00cb5
Use correct action string for provisioning.

Change to use the correct action string
com.adnroid.server.connectivityservice.CONNECTED_TO_PROVISIONING_NETWORK

Bug: 10551510
Change-Id: I917de4fcde06b72f520dec38e42c50859b2ee098
Merge tag 'android-4.3_r3.1' of https://android.googlesource.com/platform/packages/apps/Settings into cm-10.2

Android 4.3 Release 3.1

Change-Id: I774916f77f3cbb3fc20404a1572799fb28c38b10
Add active display to ChameleonOS [2/2]

PS2:
Add pocket mode option, available if the device has
a proximity sensor.

PS3:
Add option to include ongoing and non-clearable notifications.

PS4:
Allow brightness control from 0% to 100%

PS5:
Refactor for release

Change-Id: Iae55640a31df68542c2af5d95097811b8fb1f66f

Conflicts:
	res/values/arrays.xml
	res/values/strings.xml
	res/xml/system_settings.xml
Merge branch 'cm-10.2' of github.com:CyanogenMod/android_packages_apps_Settings into cm-10.2
Merge branch 'Upstream/cm-10.2'