diff options
| author | Jeff Sharkey <jsharkey@google.com> | 2020-12-09 20:46:37 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-09 20:46:37 +0000 |
| commit | cb1039d6600a1a926fd3d5e11e1513ec931735b2 (patch) | |
| tree | 44e6c1caf156aeb11fce2ac2ea679505531598b6 /mime | |
| parent | e4fae98ff287842ab14cff059aae08371877cc08 (diff) | |
| parent | 5848bfa20697bcda8cfa165032582c3b5e2dda9d (diff) | |
Merge "Add mobi extensions to known mime types" am: 806aa0b377 am: 08715462b9 am: 5848bfa206
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514851
MUST ONLY BE SUBMITTED BY AUTOMERGER
Change-Id: I107706ff1a59d76dfb610bba92d089df75a94f71
Diffstat (limited to 'mime')
| -rw-r--r-- | mime/java-res/android.mime.types | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index e5273a927007..92365d1af4c9 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -63,6 +63,7 @@ ?application/x-android-drm-fl fl ?application/x-flac flac ?application/x-font pcf +?application/x-mobipocket-ebook prc mobi ?application/x-mpegurl m3u m3u8 ?application/x-pem-file pem ?application/x-pkcs12 p12 pfx |