Merging camera test with gallery test.

Change-Id: I8ef94a67dddc67a66c1d42a1b91e0a0c380b2841

diff --git a/tests/AndroidManifest.xml b/tests/AndroidManifest.xml
index 1d53d4d..ef63cc4 100644 (file)
--- a/tests/AndroidManifest.xml
+++ b/tests/AndroidManifest.xml
@@ -25,7 +25,15 @@
              android:targetPackage="com.android.gallery3d"
              android:label="Tests for GalleryNew3D application."/>
 
+    <instrumentation android:name="com.android.gallery3d.CameraTestRunner"
+            android:targetPackage="com.android.gallery3d"
+            android:label="Camera continuous test runner"/>
+
     <instrumentation android:name="com.android.gallery3d.exif.ExifTestRunner"
             android:targetPackage="com.android.gallery3d"
             android:label="Tests for ExifParser."/>
+
+    <instrumentation android:name="com.android.gallery3d.stress.CameraStressTestRunner"
+            android:targetPackage="com.android.gallery3d"
+            android:label="Camera stress test runner"/>
 </manifest>