summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorChih-Chung Chang <chihchung@google.com>2011-11-02 17:29:37 +0000
committerAndroid Git Automerger <android-git-automerger@android.com>2011-11-02 17:29:37 +0000
commitaa77a6195b0d5d00a01c96a3281ae876a86260b5 (patch)
treeb544c47c6b33a0d091751568b343a29691d0bad5
parent59c91f039ed4b730ebbcc2effe3d64cc682641d4 (diff)
parent62485ff492b4e3b3bf4dea29b9b82773aac1e4c8 (diff)
downloadandroid_packages_apps_Snap-aa77a6195b0d5d00a01c96a3281ae876a86260b5.tar.gz
android_packages_apps_Snap-aa77a6195b0d5d00a01c96a3281ae876a86260b5.tar.bz2
android_packages_apps_Snap-aa77a6195b0d5d00a01c96a3281ae876a86260b5.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.xml3
1 files changed, 2 insertions, 1 deletions
diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index b82eab34f..013a4294a 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>
@@ -145,7 +146,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>