commit b3b72c970024548d7d36c6d064e8c46bff8fc31e
author Joshua Schwarz <joshuaschwarz@google.com> Thu Sep 03 06:38:59 2015 +0000
committer Android Git Automerger <android-git-automerger@android.com> Thu Sep 03 06:38:59 2015 +0000
tree 44df5a0c604a4b82298780798270a6720596a04b
parent a06092db5bee3ac7691a41a7edd8bd955a18498d
parent 78daa6d32d991c7a84bd0b9eb6f26ef6986c13ae

am 78daa6d3: am bade9522: am 258a7cd9: Merge "Use LOCAL_MAC_ADDRESS permission in bluetoothtests." into cw-e-dev

* commit '78daa6d32d991c7a84bd0b9eb6f26ef6986c13ae':
  Use LOCAL_MAC_ADDRESS permission in bluetoothtests.

core/tests/bluetoothtests/AndroidManifest.xml

diff --git a/core/tests/bluetoothtests/AndroidManifest.xml b/core/tests/bluetoothtests/AndroidManifest.xml
index e43ba12..7f9d874 100644
--- a/core/tests/bluetoothtests/AndroidManifest.xml
+++ b/core/tests/bluetoothtests/AndroidManifest.xml
@@ -21,6 +21,7 @@
     <uses-permission android:name="android.permission.BLUETOOTH_ADMIN" />
     <uses-permission android:name="android.permission.BROADCAST_STICKY" />
     <uses-permission android:name="android.permission.CHANGE_NETWORK_STATE" />
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
     <uses-permission android:name="android.permission.MODIFY_AUDIO_SETTINGS"/>
     <uses-permission android:name="android.permission.WRITE_EXTERNAL_STORAGE" />
     <uses-permission android:name="android.permission.WRITE_SETTINGS" />