Commit 766a8501 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: Ifc085b6cf660b3e3ed50899e31a7898fc5266447

parents aaca11c5 ed440129

mime/java-res/android.mime.types

+1 −0

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

	?image/bmp bmp		?image/bmp bmp
	?image/heic heic		?image/heic heic