diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-12-06 18:01:52 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 18:01:52 +0000 |
| commit | a00a7fdd51b59017bc1c2f7839a2ce250dc8043c (patch) | |
| tree | 46de192a2e729bd3ac41a4f54a7bf1af9d037d77 | |
| parent | c4b1ccb46884a0e23e5411f2bbb2da72fcb267ca (diff) | |
| parent | 260eb9a3562cecdeec67b6054641f4b66c61f7bf (diff) | |
| download | android_packages_apps_Bluetooth-a00a7fdd51b59017bc1c2f7839a2ce250dc8043c.tar.gz android_packages_apps_Bluetooth-a00a7fdd51b59017bc1c2f7839a2ce250dc8043c.tar.bz2 android_packages_apps_Bluetooth-a00a7fdd51b59017bc1c2f7839a2ce250dc8043c.zip | |
resolve merge conflicts of f606637 to mnc-dev am: 846c09a4ff am: 8b498077ce am: 48f7628944 am: 5bdf052376 am: 850fec4b84
am: 260eb9a356
Change-Id: I81c69b38a2109210a329902d1c97b1805674104e
| -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" /> |