diff options
| author | Ajay Panicker <apanicke@google.com> | 2016-12-06 17:45:20 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-06 17:45:20 +0000 |
| commit | 48f76289448eadf44c1d957e7f5f65f50a0382e3 (patch) | |
| tree | 198b3634889b3d4e56bee52ecba9f956d826ed68 | |
| parent | 1bd3e02a8ad8483fa0e8db5865d762fa418ab948 (diff) | |
| parent | 8b498077cec8b24b3c33d297e94f012ea63c245b (diff) | |
| download | android_packages_apps_Bluetooth-48f76289448eadf44c1d957e7f5f65f50a0382e3.tar.gz android_packages_apps_Bluetooth-48f76289448eadf44c1d957e7f5f65f50a0382e3.tar.bz2 android_packages_apps_Bluetooth-48f76289448eadf44c1d957e7f5f65f50a0382e3.zip | |
resolve merge conflicts of f606637 to mnc-dev am: 846c09a4ff
am: 8b498077ce
Change-Id: I44ffb224cf88bd92ec7a590bc3f0d327050e5109
| -rw-r--r-- | AndroidManifest.xml | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 3652fd3a0..1c0f40ae7 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -57,7 +57,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" /> |