diff options
| author | Scott Lobdell <slobdell@google.com> | 2021-01-21 14:57:51 -0800 |
|---|---|---|
| committer | Scott Lobdell <slobdell@google.com> | 2021-01-22 13:24:00 -0800 |
| commit | 7fd6edc3a3ff37a750641d5e192835fe217f6050 (patch) | |
| tree | 4369f3a76ed7ba782801984a51f7badb159a43c9 /mime | |
| parent | d1a606fc7dfdbd4a3ded9d384a2b14f36f348c51 (diff) | |
| parent | d462c4768522d0a62f3bc6cf08158ac813bc09e6 (diff) | |
Merge SP1A.210105.001
Change-Id: Iebfaf27bb339a99d9303a53e6c2c397b0001c814
Diffstat (limited to 'mime')
| -rw-r--r-- | mime/OWNERS | 2 | ||||
| -rw-r--r-- | mime/java-res/android.mime.types | 1 |
2 files changed, 3 insertions, 0 deletions
diff --git a/mime/OWNERS b/mime/OWNERS new file mode 100644 index 000000000000..235797998f24 --- /dev/null +++ b/mime/OWNERS @@ -0,0 +1,2 @@ +include platform/libcore:/OWNERS +include /core/java/android/os/storage/OWNERS diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index e5273a927007..92365d1af4c9 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -63,6 +63,7 @@ ?application/x-android-drm-fl fl ?application/x-flac flac ?application/x-font pcf +?application/x-mobipocket-ebook prc mobi ?application/x-mpegurl m3u m3u8 ?application/x-pem-file pem ?application/x-pkcs12 p12 pfx |