diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-12-06 18:05:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 18:05:52 +0000 |
| commit | 190f774cb9b672dd5fc85fa06731f40fb329f563 (patch) | |
| tree | f15ed1d479f8d54dc03ef6d5d9e2869774a8568f | |
| parent | e108406e30269336ecc4c0304901ac7ddbc14f76 (diff) | |
| parent | a00a7fdd51b59017bc1c2f7839a2ce250dc8043c (diff) | |
| download | android_packages_apps_Bluetooth-190f774cb9b672dd5fc85fa06731f40fb329f563.tar.gz android_packages_apps_Bluetooth-190f774cb9b672dd5fc85fa06731f40fb329f563.tar.bz2 android_packages_apps_Bluetooth-190f774cb9b672dd5fc85fa06731f40fb329f563.zip | |
resolve merge conflicts of f606637 to mnc-dev am: 846c09a4ff am: 8b498077ce am: 48f7628944 am: 5bdf052376 am: 850fec4b84 am: 260eb9a356
am: a00a7fdd51
Change-Id: Icd6a71d9d263dafd937c6fb08c9036745cd2191c
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 0c71e21f6..50cfada43 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -60,7 +60,6 @@ <uses-permission android:name="android.permission.WRITE_SMS" /> <uses-permission android:name="android.permission.READ_CONTACTS" /> <uses-permission android:name="android.permission.MEDIA_CONTENT_CONTROL" /> - <uses-permission android:name="android.permission.MANAGE_DOCUMENTS" /> <uses-permission android:name="android.permission.UPDATE_APP_OPS_STATS" /> <uses-permission android:name="android.permission.VIBRATE" /> <uses-permission android:name="android.permission.DEVICE_POWER" /> |