summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAjay Panicker <apanicke@google.com>2016-11-17 15:50:36 -0800
committerAdam Seaton <aseaton@google.com>2016-12-19 20:57:30 +0000
commitcbced755b72357affca9e785be8384263334833c (patch)
tree46de192a2e729bd3ac41a4f54a7bf1af9d037d77
parent1c40f9218d815e4e67482fb8913fce6850e4fb1c (diff)
downloadBluetooth-android-7.1.1_r20.tar.gz
Fix Merge Conflict in nyc-mr1-security-c-release Bug: 32612586 Change-Id: Iebe7dc9b198ce99d5921f5a349ba9d5d4424d156 (cherry picked from commit 22d032fc493070d3c4b2efffa6aa592e20cf8578)
-rw-r--r--AndroidManifest.xml1
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" />