Merge "Back-port ag/2491664" into nyc-mr1-dev am: 87c77fba92

am: 54e508ca63

Change-Id: I87608a5fc71634d99adaf2aecd1e1c1be297659f
This commit is contained in:
Phil Weaver
2017-07-19 01:00:05 +00:00
committed by android-build-merger
2 changed files with 9 additions and 0 deletions

View File

@@ -86,6 +86,7 @@
<uses-permission android:name="android.permission.PEERS_MAC_ADDRESS"/>
<uses-permission android:name="android.permission.MANAGE_NOTIFICATIONS"/>
<uses-permission android:name="android.permission.DELETE_PACKAGES"/>
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS" />
<application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings"