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

* commit '90ec22bc2c47e01bbf3179ec947fa30f3ab45724':
  [FRP] Screen Lock for Setup Wizard shows wrong title
This commit is contained in:
Lucky Zhang
2014-12-08 19:41:45 +00:00
committed by Android Git Automerger

View File

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