summaryrefslogtreecommitdiff
path: root/mime/java-res
diff options
context:
space:
mode:
authorBrian Orr <brianorr@google.com>2021-05-13 20:42:01 -0700
committerBrian Orr <brianorr@google.com>2021-05-13 20:42:01 -0700
commit1b62159ffcebb2c102e129b2e778a8f65b7e5948 (patch)
treec28571796470b5c9e3d9e8c2dc8d49ddf819fd60 /mime/java-res
parent86a43bb54c1ed3c75d072a2c465bf0447b5188c1 (diff)
parent3a582255fbbf0840208ec8cee02f8401982f0e39 (diff)
Merge SP1A.210510.001
Change-Id: Ia86f3e18206beabe334e3081cedbaf5b3274f78e
Diffstat (limited to 'mime/java-res')
-rw-r--r--mime/java-res/android.mime.types2
1 files changed, 1 insertions, 1 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index 92365d1af4c9..587367737be0 100644
--- a/mime/java-res/android.mime.types
+++ b/mime/java-res/android.mime.types
@@ -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