Merge "Permission to manage device admins"

This commit is contained in:
Amith Yamasani
2013-07-24 00:07:03 +00:00
committed by Android (Google) Code Review

View File

@@ -65,6 +65,7 @@
<uses-permission android:name="android.permission.SET_TIME" /> <uses-permission android:name="android.permission.SET_TIME" />
<uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" /> <uses-permission android:name="android.permission.ACCESS_NOTIFICATIONS" />
<uses-permission android:name="android.permission.REBOOT" /> <uses-permission android:name="android.permission.REBOOT" />
<uses-permission android:name="android.permission.MANAGE_DEVICE_ADMINS" />
<application android:label="@string/settings_label" <application android:label="@string/settings_label"
android:icon="@mipmap/ic_launcher_settings" android:icon="@mipmap/ic_launcher_settings"