summaryrefslogtreecommitdiffstats
path: root/core/java/android/webkit/MimeTypeMap.java
diff options
context:
space:
mode:
authorThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:44:00 -0800
committerThe Android Open Source Project <initial-contribution@android.com>2009-02-10 15:44:00 -0800
commitd24b8183b93e781080b2c16c487e60d51c12da31 (patch)
treefbb89154858984eb8e41556da7e9433040d55cd4 /core/java/android/webkit/MimeTypeMap.java
parentf1e484acb594a726fb57ad0ae4cfe902c7f35858 (diff)
downloadframeworks_base-d24b8183b93e781080b2c16c487e60d51c12da31.zip
frameworks_base-d24b8183b93e781080b2c16c487e60d51c12da31.tar.gz
frameworks_base-d24b8183b93e781080b2c16c487e60d51c12da31.tar.bz2
auto import from //branches/cupcake/...@130745
Diffstat (limited to 'core/java/android/webkit/MimeTypeMap.java')
-rw-r--r--core/java/android/webkit/MimeTypeMap.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java
index 685e352..c9cc208 100644
--- a/core/java/android/webkit/MimeTypeMap.java
+++ b/core/java/android/webkit/MimeTypeMap.java
@@ -480,6 +480,7 @@ public /* package */ class MimeTypeMap {
sMimeTypeMap.loadEntry("video/mpeg", "mpg", false);
sMimeTypeMap.loadEntry("video/mpeg", "mpe", false);
sMimeTypeMap.loadEntry("video/mp4", "mp4", false);
+ sMimeTypeMap.loadEntry("video/mpeg", "VOB", false);
sMimeTypeMap.loadEntry("video/quicktime", "qt", false);
sMimeTypeMap.loadEntry("video/quicktime", "mov", false);
sMimeTypeMap.loadEntry("video/vnd.mpegurl", "mxu", false);