commit f53f3740f4806b8b2bf4ad994dc2dae6618530a5
author The Android Automerger <android-build@android.com> Thu Feb 02 07:03:20 2012 -0800
committer The Android Automerger <android-build@android.com> Thu Feb 02 07:03:20 2012 -0800
tree e76e65c0ae185127f8f8e283d8cbbfe9cea99016
parent 902fff97ffc7321faa1138b91d1f9043c20a1b82
parent 0255cf81253056c038499f4c8464ae088de4a387

merge in jb-release history after reset to master

src/com/android/videoeditor/VideoEditorActivity.java

diff --git a/src/com/android/videoeditor/VideoEditorActivity.java b/src/com/android/videoeditor/VideoEditorActivity.java
index dba0d49..193bae3 100755
--- a/src/com/android/videoeditor/VideoEditorActivity.java
+++ b/src/com/android/videoeditor/VideoEditorActivity.java
@@ -556,7 +556,6 @@
                         MediaStore.Video.Media.EXTERNAL_CONTENT_URI, values);
                 final Intent intent = new Intent(MediaStore.ACTION_VIDEO_CAPTURE);
                 intent.putExtra(MediaStore.EXTRA_OUTPUT, mCaptureMediaUri);
-                intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1);
                 startActivityForResult(intent, REQUEST_CODE_CAPTURE_VIDEO);
                 return true;
             }
@@ -570,7 +569,6 @@
                         MediaStore.Images.Media.EXTERNAL_CONTENT_URI, values);
                 final Intent intent = new Intent(MediaStore.ACTION_IMAGE_CAPTURE);
                 intent.putExtra(MediaStore.EXTRA_OUTPUT, mCaptureMediaUri);
-                intent.putExtra(MediaStore.EXTRA_VIDEO_QUALITY, 1);
                 startActivityForResult(intent, REQUEST_CODE_CAPTURE_IMAGE);
                 return true;
             }