am 3a3f495e: am 23d4ebdc: am 74f8cb9c: am c3067882: Merge "Added android.permission.PEERS_MAC_ADDRESS permission" into mnc-dev

* commit '3a3f495e2480235a83fdd9c7efe6810f003504bc':
  Added android.permission.PEERS_MAC_ADDRESS permission
This commit is contained in:
Fyodor Kupolov
2015-07-30 21:21:14 +00:00
committed by Android Git Automerger

View File

@@ -80,6 +80,7 @@
<uses-permission android:name="android.permission.MANAGE_FINGERPRINT" /> <uses-permission android:name="android.permission.MANAGE_FINGERPRINT" />
<uses-permission android:name="android.permission.USER_ACTIVITY" /> <uses-permission android:name="android.permission.USER_ACTIVITY" />
<uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" /> <uses-permission android:name="android.permission.CHANGE_APP_IDLE_STATE" />
<uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings" android:icon="@mipmap/ic_launcher_settings"