diff options
| author | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-17 12:20:42 -0400 |
|---|---|---|
| committer | Android (Google) Code Review <android-gerrit@google.com> | 2009-10-17 12:20:42 -0400 |
| commit | eab82c3c8c9dd88ff7267c154b415558d8e5c206 (patch) | |
| tree | a0d2605aebeb1d26caa4fda21bee6890e4f01395 /core/java/android/webkit | |
| parent | dbdc5e15a3d338048dd5b98af463b1857536e4c6 (diff) | |
| parent | 3905e87e906044e7bdab31041ef13c86a74c1d85 (diff) | |
| download | frameworks_base-eab82c3c8c9dd88ff7267c154b415558d8e5c206.zip frameworks_base-eab82c3c8c9dd88ff7267c154b415558d8e5c206.tar.gz frameworks_base-eab82c3c8c9dd88ff7267c154b415558d8e5c206.tar.bz2 | |
Merge change I44bbc36d into eclair-mr2
* changes:
Add htm and html extensions to the map as "text/html"
Diffstat (limited to 'core/java/android/webkit')
| -rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index fffba1b..b2395d7 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -431,6 +431,8 @@ public class MimeTypeMap { sMimeTypeMap.loadEntry("text/calendar", "icz"); sMimeTypeMap.loadEntry("text/comma-separated-values", "csv"); sMimeTypeMap.loadEntry("text/css", "css"); + sMimeTypeMap.loadEntry("text/html", "htm"); + sMimeTypeMap.loadEntry("text/html", "html"); sMimeTypeMap.loadEntry("text/h323", "323"); sMimeTypeMap.loadEntry("text/iuls", "uls"); sMimeTypeMap.loadEntry("text/mathml", "mml"); |