Commit cb1039d6 authored Dec 09, 2020 by Jeff Sharkey Committed by Automerger Merge Worker Dec 09, 2020

Merge "Add mobi extensions to known mime types" am: 806aa0b3 am: 08715462 am: 5848bfa2

Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1514851

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: I107706ff1a59d76dfb610bba92d089df75a94f71

parents e4fae98f 5848bfa2

mime/java-res/android.mime.types

+1 −0

Original line number	Diff line number	Diff line
		@@ -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