Merge "settings(manifest): Add NETWORK_SETTINGS permission" into oc-mr1-dev

am: 7030ceb9e3

Change-Id: I0a9cbb6a36950f354145ca1a1a0dac71506aee68
This commit is contained in:
Roshan Pius
2017-07-25 17:19:12 +00:00
committed by android-build-merger

View File

@@ -85,6 +85,7 @@
<uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/> <uses-permission android:name="android.permission.MANAGE_APP_OPS_RESTRICTIONS"/>
<uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/> <uses-permission android:name="android.permission.HIDE_NON_SYSTEM_OVERLAY_WINDOWS"/>
<uses-permission android:name="android.permission.READ_PRINT_SERVICES" /> <uses-permission android:name="android.permission.READ_PRINT_SERVICES" />
<uses-permission android:name="android.permission.NETWORK_SETTINGS" />
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@drawable/ic_launcher_settings" android:icon="@drawable/ic_launcher_settings"