commit e3ac32d35f94e519d886dc0413be012bf532b6bb
author Amith Yamasani <yamasani@google.com> Tue Mar 11 09:13:17 2014 -0700
committer Android Git Automerger <android-git-automerger@android.com> Tue Mar 11 09:13:17 2014 -0700
tree 37cfc225dcbe9e3ed355e1824390458df01c4ed0
parent 709aab4e56d8492635e00bc27147f0314edb9779
parent 960fbf3ad6f86b41324bd52b40700d931cd39b48

am 960fbf3a: am 6d9de340: am db480947: am 6beacd77: am a0ab4ce0: am 02c2d643: Fix a syntax error in the manifest

* commit '960fbf3ad6f86b41324bd52b40700d931cd39b48':
  Fix a syntax error in the manifest

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index e385504..c3232bf 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -214,7 +214,7 @@
         </activity>
 
         <activity android:name=".security.LockConfirmBypassTest"
-                android:label="@string/lock_confirm_test_title">
+                android:label="@string/lock_confirm_test_title"
                 android:configChanges="keyboardHidden|orientation|screenSize" >
             <intent-filter>
                 <action android:name="android.intent.action.MAIN" />