summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-10-31 11:23:43 +0800
committerChih-Chung Chang <chihchung@google.com>2011-10-31 11:23:43 +0800
commit62485ff492b4e3b3bf4dea29b9b82773aac1e4c8 (patch)
tree165550d0b723dfe63aefc3c63361175cc2389bca
parent103febb6c83c96c356dde7c388f4faeffb5a9a11 (diff)
downloadandroid_packages_apps_Snap-62485ff492b4e3b3bf4dea29b9b82773aac1e4c8.tar.gz
android_packages_apps_Snap-62485ff492b4e3b3bf4dea29b9b82773aac1e4c8.tar.bz2
android_packages_apps_Snap-62485ff492b4e3b3bf4dea29b9b82773aac1e4c8.zip
Fix 5514384: add video/avi as a supported mime type.
Change-Id: I197711a1ef0f5b6356573944c3012c6a14905579
-rw-r--r--AndroidManifest.xml3
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>