summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
author Jeff Sharkey <jsharkey@google.com> 2020-12-09 20:41:03 +0000
committer Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> 2020-12-09 20:41:03 +0000
commit5848bfa20697bcda8cfa165032582c3b5e2dda9d (patch)
tree99606de8080376a36c956d95e4f1e1b56999383f
parent5e7566fa3122df46dc15ea0244e9e5a65893b1c3 (diff)
parent08715462b94264605075edb885c8d81208fdeeb5 (diff)
Merge "Add mobi extensions to known mime types" am: 806aa0b377 am: 08715462b9
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514851 MUST ONLY BE SUBMITTED BY AUTOMERGER Change-Id: I3a9799552789c2a74429de97d4ec572fa86afba2
-rw-r--r--mime/java-res/android.mime.types1
1 files changed, 1 insertions, 0 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index f3730f2756d2..88179a178fde 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