Merge RP1A.191114.001

Change-Id: I30dd2dce3b0c2fcd635381413a213fe3e97be97b

1 files changed, 12 insertions, 6 deletions

diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types
index 7a5299ff1b69..cb04d921bd67 100644
--- a/mime/java-res/android.mime.types
+++ b/mime/java-res/android.mime.types
@@ -48,6 +48,9 @@
 ?application/epub+zip epub
 ?application/pkix-cert cer
 ?application/rss+xml rss
+?application/sdp sdp
+?application/smil+xml smil
+?application/ttml+xml ttml dfxp
 ?application/vnd.android.ota ota
 ?application/vnd.apple.mpegurl m3u8
 ?application/vnd.ms-pki.stl stl
@@ -67,12 +70,14 @@
 ?application/x-x509-server-cert crt
 ?application/x-x509-user-cert crt
 
-?audio/3gpp 3gpp
+?audio/3gpp 3gpp 3ga
 ?audio/aac-adts aac
+?audio/ac3 ac3 a52
+?audio/amr amr
 ?audio/imelody imy
 ?audio/midi rtttl xmf
 ?audio/mobile-xmf mxmf
-?audio/mp4 m4a
+?audio/mp4 m4a m4b m4p f4a f4b f4p
 ?audio/mpegurl m3u
 ?audio/sp-midi smf
 ?audio/x-matroska mka
@@ -101,10 +106,11 @@
 ?text/xml xml
 ?text/x-vcard vcf
 
-?video/3gpp2 3gpp2 3g2
+?video/3gpp2 3gpp2 3gp2 3g2
 ?video/3gpp 3gpp
 ?video/avi avi
 ?video/m4v m4v
+?video/mp4 m4v f4v mp4v mpeg4
 ?video/mp2p mpeg
 ?video/mp2t m2ts mts
 ?video/mp2ts ts
@@ -129,11 +135,11 @@
 
 application/pgp-signature pgp
 application/x-x509-ca-cert crt
-audio/aac aac
+audio/aac aac adts adt
 audio/basic snd
 audio/flac flac
 audio/midi rtx
-audio/mpeg mp3 m4a m4r
+audio/mpeg mp3 mp2 mp1 mpa m4a m4r
 audio/x-mpegurl m3u m3u8
 image/jpeg jpg
 image/x-ms-bmp bmp
@@ -141,6 +147,6 @@ text/plain txt
 text/x-c++hdr hpp
 text/x-c++src cpp
 video/3gpp 3gpp
-video/mpeg mpeg
+video/mpeg mpeg mpeg2 mpv2 mp2v m2v m2t mpeg1 mpv1 mp1v m1v
 video/quicktime mov
 video/x-matroska mkv