Commit 9e0231b9 authored Apr 27, 2020 by Jeff Sharkey Committed by Automerger Merge Worker Apr 27, 2020

Merge "Fix inconsistent MIME type mapping." into rvc-dev am: 0920ccba

Change-Id: I51b7e8400d9f4009b2eab12c7cce927de03318b9

mime/java-res/android.mime.types

+1 −1

Original line number	Diff line number	Diff line
		@@ -72,7 +72,7 @@
		?application/x-x509-server-cert crt
		?application/x-x509-user-cert crt

		?audio/3gpp 3gpp 3ga
		?audio/3gpp 3ga 3gpp
		?audio/aac-adts aac
		?audio/ac3 ac3 a52
		?audio/amr amr