am 90ec22bc: am 07117147: Merge "[FRP] Screen Lock for Setup Wizard shows wrong title" into lmp-mr1-dev

automerge: 44f44a0

* commit '44f44a0c54a8467307b55f244866e67bf48d3d62':
  [FRP] Screen Lock for Setup Wizard shows wrong title
This commit is contained in:
Lucky Zhang
2014-12-09 23:15:37 +00:00
committed by android-build-merger

View File

@@ -1144,7 +1144,7 @@
<activity android:name="SetupChooseLockGeneric" <activity android:name="SetupChooseLockGeneric"
android:taskAffinity="com.android.wizard" android:taskAffinity="com.android.wizard"
android:theme="@style/SetupWizardDisableAppStartingTheme" android:theme="@style/SetupWizardDisableAppStartingTheme"
android:label="@string/lockpassword_choose_lock_generic_header"> android:label="@string/lock_settings_picker_title">
<intent-filter> <intent-filter>
<action android:name="com.android.settings.SETUP_LOCK_SCREEN" /> <action android:name="com.android.settings.SETUP_LOCK_SCREEN" />
<category android:name="android.intent.category.DEFAULT" /> <category android:name="android.intent.category.DEFAULT" />