Commit 82d75b27 authored Jun 18, 2020 by TreeHugger Robot Committed by Automerger Merge Worker Jun 18, 2020

Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed440129

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

Change-Id: Ie51d9c61a81fef8d7113cce83ceb8a228c78a70a

parents a1a8fc38 ed440129

mime/java-res/android.mime.types

+1 −0

Original line number	Diff line number	Diff line
		@@ -84,6 +84,7 @@
		?audio/sp-midi smf
		?audio/x-matroska mka
		?audio/x-pn-realaudio ra
		?audio/x-mpeg mp3

		?image/bmp bmp
		?image/heic heic