commit 59af87c2b694fad361c5f7e053a19bf9e1483afa
author Nicholas Sauer <nicksauer@google.com> Wed Aug 26 18:25:26 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Aug 26 18:25:26 2015 +0000
tree b11831e340081d187257d66a99bcb2a0f7fea162
parent e67268e66d5507832fa0c53dc7e08a72662610bc
parent 7c17ec5fa5cb51d12713016622e4b5a939c8bb76

am 7c17ec5f: Merge "Add GET_APP_OPS_STATS to Shell" into mnc-dev

* commit '7c17ec5fa5cb51d12713016622e4b5a939c8bb76':
  Add GET_APP_OPS_STATS to Shell

packages/Shell/AndroidManifest.xml

diff --git a/packages/Shell/AndroidManifest.xml b/packages/Shell/AndroidManifest.xml
index c00fdf3..37e0db0 100644
--- a/packages/Shell/AndroidManifest.xml
+++ b/packages/Shell/AndroidManifest.xml
@@ -104,6 +104,7 @@
     <uses-permission android:name="android.permission.REGISTER_CALL_PROVIDER" />
     <uses-permission android:name="android.permission.REGISTER_CONNECTION_MANAGER" />
     <uses-permission android:name="android.permission.REGISTER_SIM_SUBSCRIPTION" />
+    <uses-permission android:name="android.permission.GET_APP_OPS_STATS" />
 
     <application android:label="@string/app_label">
         <provider