commit 9c995eebfcd08f162fecaceea48551b389f38c81
author Brian Muramatsu <btmura@google.com> Mon Nov 21 16:25:18 2011 -0800
committer Android (Google) Code Review <android-gerrit@google.com> Mon Nov 21 16:25:18 2011 -0800
tree 5548d9d7a8d3ff15d17f9c35d4880e2c20249ec5
parent c15607f8acd63f86b3a2b33b0a83c2594b10a54e
parent 1b7f20705c0782addf27ae9483f486418e8eb0ea

Merge "DO NOT MERGE Disable Camera Analyzer" into ics-mr0

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 2f2cbf8..d2171ff 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -273,11 +273,6 @@
 
         <activity android:name=".camera.analyzer.CameraAnalyzerActivity"
                 android:label="@string/camera_analyzer">
-            <intent-filter>
-                <action android:name="android.intent.action.MAIN" />
-                <category android:name="android.cts.intent.category.MANUAL_TEST" />
-            </intent-filter>
-            <meta-data android:name="test_category" android:value="@string/test_category_camera" />
         </activity>
 
         <activity android:name=".usb.UsbAccessoryTestActivity"