diff options
| author | Android Git Automerger <android-git-automerger@android.com> | 2009-07-29 16:42:09 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2009-07-29 16:42:09 -0700 |
| commit | ce4105002310a22e104d29d56913cbca9cd485be (patch) | |
| tree | 6361a84f63cb9b359f66a878a7818df2de592386 /core/java/android/webkit/MimeTypeMap.java | |
| parent | e712ee3fe1b9ec950dbe5d77993751c2b7b1011c (diff) | |
| parent | 4d4229e4d9d9dcbfa281dc0fb54ddabf91b5fe0e (diff) | |
| download | frameworks_base-ce4105002310a22e104d29d56913cbca9cd485be.zip frameworks_base-ce4105002310a22e104d29d56913cbca9cd485be.tar.gz frameworks_base-ce4105002310a22e104d29d56913cbca9cd485be.tar.bz2 | |
resolved conflicts for merge of 4d4229e4 to master
Diffstat (limited to 'core/java/android/webkit/MimeTypeMap.java')
| -rw-r--r-- | core/java/android/webkit/MimeTypeMap.java | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/core/java/android/webkit/MimeTypeMap.java b/core/java/android/webkit/MimeTypeMap.java index b2aa524..a55dbc8 100644 --- a/core/java/android/webkit/MimeTypeMap.java +++ b/core/java/android/webkit/MimeTypeMap.java @@ -330,6 +330,7 @@ public class MimeTypeMap { sMimeTypeMap.loadEntry("application/x-wingz", "wz"); sMimeTypeMap.loadEntry("application/x-webarchive", "webarchive"); sMimeTypeMap.loadEntry("application/x-x509-ca-cert", "crt"); + sMimeTypeMap.loadEntry("application/x-x509-user-cert", "crt"); sMimeTypeMap.loadEntry("application/x-xcf", "xcf"); sMimeTypeMap.loadEntry("application/x-xfig", "fig"); sMimeTypeMap.loadEntry("application/xhtml+xml", "xhtml"); |