commit 3a01d17c5ced4037a467e25e522abe81b2968859
author Unsuk Jung <unsuk@google.com> Wed Oct 02 09:30:00 2013 -0700
committer Android Git Automerger <android-git-automerger@android.com> Wed Oct 02 09:30:00 2013 -0700
tree a7a84ae3e3ce6ad643792ac2ae5a420182fe1f44
parent 35dd75a5072cdab7cb254e9499ba12f456230808
parent 10cc7119b949b032bf2cd99a8c9512eff0e5fc82

am 10cc7119: am cc2da127: am efae9e6d: Merge "Fixed "Camera FOV Calibration" crash issue for non back-facing camera." into jb-mr1.1-dev

* commit '10cc7119b949b032bf2cd99a8c9512eff0e5fc82':
  Fixed "Camera FOV Calibration" crash issue for non back-facing camera.
  Fix directory recursion in FileSystemPermissionTest

apps/CtsVerifier/AndroidManifest.xml

diff --git a/apps/CtsVerifier/AndroidManifest.xml b/apps/CtsVerifier/AndroidManifest.xml
index 88c5069..fe72362 100644
--- a/apps/CtsVerifier/AndroidManifest.xml
+++ b/apps/CtsVerifier/AndroidManifest.xml
@@ -354,7 +354,7 @@
             </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.sensor.gyroscope" />
-            <meta-data android:name="test_required_features" android:value="android.hardware.camera.any"/>
+            <meta-data android:name="test_required_features" android:value="android.hardware.camera"/>
         </activity>
         <activity
             android:name=".camera.fov.DetermineFovActivity"