AI 143906: am: CL 143905 am: CL 143904 Fix the failure in the media recorder large test by adding the Camera permission.
  Original author: yslau
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143906
diff --git a/media/tests/MediaFrameworkTest/AndroidManifest.xml b/media/tests/MediaFrameworkTest/AndroidManifest.xml
index a32f590..d0ff9ce 100644
--- a/media/tests/MediaFrameworkTest/AndroidManifest.xml
+++ b/media/tests/MediaFrameworkTest/AndroidManifest.xml
@@ -18,6 +18,7 @@
     package="com.android.mediaframeworktest">
     
     <uses-permission android:name="android.permission.RECORD_AUDIO" />
+    <uses-permission android:name="android.permission.CAMERA" />
     <application>    
         <uses-library android:name="android.test.runner" />
         <activity android:label="@string/app_name"