diff options
author | Chih-Chung Chang <chihchung@google.com> | 2011-11-01 02:23:32 +0000 |
---|---|---|
committer | Android Git Automerger <android-git-automerger@android.com> | 2011-11-01 02:23:32 +0000 |
commit | b1bfac81e2db44b2b33c16f854884749ca86c111 (patch) | |
tree | 165550d0b723dfe63aefc3c63361175cc2389bca | |
parent | 46f7444d065c9dec5ae51b97dcfbf3793ad6b950 (diff) | |
parent | 62485ff492b4e3b3bf4dea29b9b82773aac1e4c8 (diff) | |
download | android_packages_apps_Snap-b1bfac81e2db44b2b33c16f854884749ca86c111.tar.gz android_packages_apps_Snap-b1bfac81e2db44b2b33c16f854884749ca86c111.tar.bz2 android_packages_apps_Snap-b1bfac81e2db44b2b33c16f854884749ca86c111.zip |
am 4c89478b: Fix 5514384: add video/avi as a supported mime type.
* commit '4c89478bfcea7a9b9f6ccc45594b472735e04f56':
Fix 5514384: add video/avi as a supported mime type.
-rw-r--r-- | AndroidManifest.xml | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml index 11e59abd2..798a46ebe 100644 --- a/AndroidManifest.xml +++ b/AndroidManifest.xml @@ -52,6 +52,7 @@ <data android:mimeType="video/3gpp" /> <data android:mimeType="video/3gpp2" /> <data android:mimeType="video/webm" /> + <data android:mimeType="video/avi" /> <data android:mimeType="application/sdp" /> </intent-filter> <intent-filter> @@ -144,7 +145,7 @@ <activity-alias android:name="com.cooliris.media.Gallery" android:targetActivity="com.android.gallery3d.app.Gallery" android:configChanges="keyboardHidden|orientation|screenSize" - android:label="string/app_name"> + android:label="@string/app_name"> <intent-filter> <action android:name="android.intent.action.MAIN" /> </intent-filter> |