Commit ecf5b945 authored May 06, 2021 by Alex Johnston Committed by Automerger Merge Worker May 06, 2021

Merge "Allow installation of cert with .der extension" into sc-dev am: f78caf8e

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

Change-Id: I7c43efedc1a5c7fe54145fbbb8b7532f106d5675

parents a46ed6db f78caf8e

mime/java-res/android.mime.types

+1 −1

Original line number	Diff line number	Diff line
		@@ -139,7 +139,7 @@
		# that may have been defined earlier.

		application/pgp-signature pgp
		application/x-x509-ca-cert crt
		application/x-x509-ca-cert crt der
		audio/aac aac adts adt
		audio/basic snd
		audio/flac flac