summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSander Alewijnse <salewijnse@google.com>2014-07-17 09:01:40 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2014-07-17 00:10:10 +0000
commite8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc (patch)
tree67d0509e0da17466cefd653a5b859b9534189efd
parent3484638cad97e255a412b0489a63873fb3ca4218 (diff)
parent97c492ce4d26eb4afa4e3dd9eabe377fcfbc3d2a (diff)
downloadandroid_packages_apps_Trebuchet-e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc.zip
android_packages_apps_Trebuchet-e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc.tar.gz
android_packages_apps_Trebuchet-e8a30577f7451ed0f50ce7cd86e0d3f0c0e0d0bc.tar.bz2
Merge "Revert "Add uses feature managed profiles to Launcher3 manifest."" into ub-now-master
-rw-r--r--AndroidManifest.xml2
1 files changed, 0 insertions, 2 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e6a8bea..67d86d2 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -71,8 +71,6 @@
<uses-permission android:name="com.android.launcher3.permission.WRITE_SETTINGS" />
<uses-permission android:name="com.android.launcher3.permission.RECEIVE_LAUNCH_BROADCASTS" />
- <uses-feature android:name="android.software.managed_profiles" android:required="false"/>
-
<application
android:name="com.android.launcher3.LauncherApplication"
android:label="@string/application_name"