commit 1f207ddd4187abf3aaa7b68cdcfd302097d64a35
author Amit Pundir <amit.pundir@linaro.org> Wed Sep 18 01:10:53 2013 +0530
committer Amit Pundir <amit.pundir@linaro.org> Wed Sep 18 01:10:53 2013 +0530
tree b6854f82ab79bc1322ce0a9c014be3c163802755
parent ea8fbf94be29f55742d9dab117d021a57da0ba9c
parent a6683e0f4af75005ab5a1742d30df4bee071f725

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>