commit c5a7c07ed3c4ff8a08078ab510429d093b90f732
author Linux Build Service Account <lnxbuild@localhost> Sat Nov 08 05:37:31 2014 -0800
committer Gerrit - the friendly Code Review server <code-review@localhost> Sat Nov 08 05:37:31 2014 -0800
tree 742a5d2f29e0775d319ea993cda217c1cc547c98
parent 2dcea5f251b49c9420899cefb2fe712058cfd74c
parent cdb15f44c84cfd811c56f7c9f53c3c2690f53448

Merge "Gallery2: add extra mimetypes to gallery manifest"

AndroidManifest.xml

diff --git a/AndroidManifest.xml b/AndroidManifest.xml
index 95beee1..ed0a0e4 100644
--- a/AndroidManifest.xml
+++ b/AndroidManifest.xml
@@ -70,6 +70,14 @@
                 <data android:mimeType="video/webm" />
                 <data android:mimeType="video/avi" />
                 <data android:mimeType="application/sdp" />
+                <data android:mimeType="video/mp2ts" />
+                <data android:mimeType="video/x-ms-asf" />
+                <data android:mimeType="video/x-ms-wmv" />
+                <data android:mimeType="video/x-matroska" />
+                <data android:mimeType="video/x-msvideo"/>
+                <data android:mimeType="video/divx" />
+                <data android:mimeType="video/mkv" />
+                <data android:mimeType="video/mpeg" />
              </intent-filter>
              <intent-filter>
                 <!-- HTTP live support -->