commit 3d87934560b95560b9dc07e2e5c1f49c00369597
author Yin-Chia Yeh <yinchiayeh@google.com> Fri Aug 14 21:05:31 2015 +0000
committer android-build-merger <android-build-merger@google.com> Fri Aug 14 21:05:31 2015 +0000
tree 4af36b35e8f1b779b986243dc20c5b01c16c5fad
parent de234ef4418ff7789a2d08c8886cf5f3098e7268
parent d7b360971a7bbfd98dd357fdb6e6c896008b22d4

Merge "DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop" into lollipop-cts-dev
automerge: d7b3609

* commit 'd7b360971a7bbfd98dd357fdb6e6c896008b22d4':
  DO NOT MERGE ANYWHERE: Camera: remove ITS from Lollipop

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index f1f73a2..39a474e 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -951,17 +951,6 @@
                     android:value="android.hardware.camera.any"/>
         </activity>
 
-        <activity android:name=".camera.its.ItsTestActivity"
-                  android:label="@string/camera_its_test"
-                  android:configChanges="keyboardHidden|orientation|screenSize">
-            <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" />
-            <meta-data android:name="test_required_features" android:value="android.hardware.camera.any" />
-        </activity>
-
         <activity android:name=".usb.UsbAccessoryTestActivity"
                 android:label="@string/usb_accessory_test"
                 android:configChanges="keyboardHidden|orientation|screenSize">