commit f17cff3f88ce63f4cf719d3aeb269d854f700525
author Svetoslav <svetoslavganov@google.com> Tue May 19 00:13:26 2015 +0000
committer Android (Google) Code Review <android-gerrit@google.com> Tue May 19 00:13:27 2015 +0000
tree df9b04e5c2b82dba940ac6cc87fdb96b6cef03b3
parent e50b1903f2e84de2d23c035f8444cb83e1ae6226
parent 7ec0ae47daed2fd2db281ae440e358bd0c37c86f

Merge "Request the new MAC address permission to show the MAC address in the UI" into mnc-dev

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index f8c737f..27f93c6 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -109,6 +109,7 @@
     <uses-permission android:name="com.android.voicemail.permission.ADD_VOICEMAIL" />
     <uses-permission android:name="com.android.voicemail.permission.WRITE_VOICEMAIL" />
     <uses-permission android:name="com.android.voicemail.permission.READ_VOICEMAIL" />
+    <uses-permission android:name="android.permission.LOCAL_MAC_ADDRESS" />
 
 
     <!-- This tells the activity manager to not delay any of our activity