diff options
author | Steven Laver <lavers@google.com> | 2020-01-23 17:03:21 -0800 |
---|---|---|
committer | Steven Laver <lavers@google.com> | 2020-02-04 23:22:55 +0000 |
commit | 71998c3d8b36220df1be12fe6e1ba7eda81cde41 (patch) | |
tree | 8b5e07fadfa5561f430abd298094046a496c3fb3 /mime/java-res | |
parent | 4307c64762e7fd78e8cdd955296655d51a6094e2 (diff) | |
parent | db0ac39741da692dddac3ff31aa87634af92e1e8 (diff) |
Merge RP1A.200123.001
Change-Id: I16a4437d9876db7a6a2b07231b4584df4564bee4
Diffstat (limited to 'mime/java-res')
-rw-r--r-- | mime/java-res/android.mime.types | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index cb04d921bd67..c1f8b3f0e195 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -46,6 +46,7 @@ # <extension1> and <extension2> are mapped (or remapped) to <mimeType>. ?application/epub+zip epub +?application/lrc lrc ?application/pkix-cert cer ?application/rss+xml rss ?application/sdp sdp @@ -65,6 +66,7 @@ ?application/x-mpegurl m3u m3u8 ?application/x-pem-file pem ?application/x-pkcs12 p12 pfx +?application/x-subrip srt ?application/x-webarchive webarchive ?application/x-webarchive-xml webarchivexml ?application/x-x509-server-cert crt |