tree b6854f82ab79bc1322ce0a9c014be3c163802755
parent ea8fbf94be29f55742d9dab117d021a57da0ba9c
parent a6683e0f4af75005ab5a1742d30df4bee071f725
author Amit Pundir <amit.pundir@linaro.org> 1379446853 +0530
committer Amit Pundir <amit.pundir@linaro.org> 1379446853 +0530
mergetag object a6683e0f4af75005ab5a1742d30df4bee071f725
 type commit
 tag android-4.3_r3
 tagger The Android Open Source Project <initial-contribution@android.com> 1379360787 -0700
 
 Android 4.3 release 3.0
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.11 (GNU/Linux)
 
 iEYEABECAAYFAlI3YBMACgkQ6K0/gZqxDnggrwCfalnePWvJZ1n5sKRQOdhni0s6
 XuYAn2s/hVhBEAmM9YM3GBYuk6FMqMKG
 =ds/L
 -----END PGP SIGNATURE-----

Merge android-4.3_r3:
Android 4.3 release 3.0

* tag 'android-4.3_r3':
  Reset app preferences now resets all app ops.
  Completely remove app ops activity.
  Revert "Completely remove app ops activity."
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Import translations. DO NOT MERGE
  Use ConnectivityManager for mobile provision url
  Import translations. DO NOT MERGE
  Completely remove app ops activity.

Conflicts:
	res/values/strings.xml

Change-Id: Ie921215898747053925b6b5df27850b934972eee
Signed-off-by: Amit Pundir <amit.pundir@linaro.org>