commit 1e1cffe9ae8fdacd83456c3e16589bc2d970cd1b
author Esteban Talavera <etalavera@google.com> Wed Sep 10 17:22:50 2014 +0000
committer Android Git Automerger <android-git-automerger@android.com> Wed Sep 10 17:22:50 2014 +0000
tree a2c8df2dfc021f520d0fce6eb035dd90f948d8fe
parent b4f4992b4c3933ced0e1d4eb10a2e9fb4f624b42
parent dc282036abaa50aa68647e7e36dae399403c25a6

am dc282036: am 9c8f4b85: Merge "Update string value for managed provisioning action" into lmp-dev

* commit 'dc282036abaa50aa68647e7e36dae399403c25a6':
  Update string value for managed provisioning action

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index e2f7dc4..0225582 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -85,7 +85,7 @@
             android:theme="@style/SetupWorkSpaceTheme"
             android:screenOrientation="locked">
             <intent-filter>
-                <action android:name="android.app.action.ACTION_PROVISION_MANAGED_PROFILE" />
+                <action android:name="android.app.action.PROVISION_MANAGED_PROFILE" />
                 <category android:name="android.intent.category.DEFAULT" />
             </intent-filter>
         </activity>