commit 7da8cae44b622518fbffd6d265f291c39e9fc722
author Jim Miller <jaggies@google.com> Thu Jan 06 21:52:09 2011 -0800
committer Jim Miller <jaggies@google.com> Sun Jan 09 13:57:53 2011 -0800
tree 9bb0a4902cb35fc28d36f5643280a95a9c297765
parent 580c80f853747741ae74fbb6f670315077586208

Fix 3281395: Fix duplicate title in LockScreen Settings. [DO NOT MERGE]

Manual merge of Change-Id: I3c53d1864e521f4245b94d39664266891a728615

Change-Id: I59eedd81af226949ac0df10390ae0642e1812c5a

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index a94258e..2618182 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -712,11 +712,9 @@
 
 
         <!-- Lock screen settings -->
-        <activity android:name="ConfirmLockPattern"
-            android:label="@string/lockpassword_confirm_your_pattern_header"/>
+        <activity android:name="ConfirmLockPattern"/>
 
-        <activity android:name="ConfirmLockPassword"
-            android:label="@string/lockpassword_confirm_your_password_header"/>>
+        <activity android:name="ConfirmLockPassword"/>
 
         <activity android:name="ChooseLockGeneric"
             android:label="@string/lockpassword_choose_lock_generic_header">
@@ -726,14 +724,11 @@
             </intent-filter>
         </activity>
 
-        <activity android:name="ChooseLockPattern" android:exported="false"
-            android:label="@string/lockpassword_choose_your_pattern_header"/>
+        <activity android:name="ChooseLockPattern" android:exported="false"/>
 
-        <activity android:name="ChooseLockPassword" android:exported="false"
-            android:label="@string/lockpassword_choose_your_password_header"/>
+        <activity android:name="ChooseLockPassword" android:exported="false"/>
 
-        <activity android:name="ChooseLockPatternTutorial"
-            android:label="@string/lockpassword_choose_your_pattern_header"/>
+        <activity android:name="ChooseLockPatternTutorial" android:exported="false"/>
 
         <!-- Runs in the phone process since it needs access to the Phone object -->
         <activity android:name=".deviceinfo.Status"