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
fix Carbon Statistics
Merge branch 'jb-mr2.0.0-release' of https://android.googlesource.com/platform/packages/apps/Settings into jb3

Conflicts:
	res/values/strings.xml
	src/com/android/settings/WirelessSettings.java
Merge branch 'temp' of https://github.com/CarbonDev/android_packages_apps_Settings into jb3
Fix issue #10190597: "Any permission restrictions" is displayed after a...

...newline in "Reset app preferences" dialog

Change-Id: I3125155d992af0654175659294bfb2fb325ccb57
Option to use volume keys to control media volume anytime (1/2)

Some users don't adjust ringtone volume often (e.g. only use toggle to
switch between silent and non-silent) mode. Having an option to
use the volume keys to control media volume anytime allows media
volume to be controllled/muted before entering a game or other apps
with sound in an undesirable location.

Change-Id: I6dbd25d1a14bcf5b1bf0b0468b96f4b4f8efdb14
Merge remote-tracking branch 'upstream/jb3' into jb3

Conflicts:
	res/values-ru/strings.xml