diff options
| author | 2024-03-07 16:51:54 +0000 | |
|---|---|---|
| committer | 2024-03-07 16:51:54 +0000 | |
| commit | 4681b3be90e108b305fcef76fabaa4f9fb431efc (patch) | |
| tree | 2e2c95710e81bd87edd903a6a759c5ef3fea3e98 | |
| parent | 74cb5af8500dd6a546a7b4dee6f50dd0e7e6a23b (diff) | |
| parent | 9a72d00f23db7c228d53f499b678067c506a6e43 (diff) | |
Merge "Update Android's bundled mime.types mapping." into main
| -rw-r--r-- | mime/java-res/android.mime.types | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/mime/java-res/android.mime.types b/mime/java-res/android.mime.types index b7955603a97a..5cf807d68d77 100644 --- a/mime/java-res/android.mime.types +++ b/mime/java-res/android.mime.types @@ -80,6 +80,7 @@ ?audio/aac-adts aac ?audio/ac3 ac3 a52 ?audio/amr amr +?audio/x-gsm gsm ?audio/imelody imy ?audio/midi rtttl xmf ?audio/mobile-xmf mxmf @@ -103,6 +104,7 @@ ?image/x-adobe-dng dng ?image/x-fuji-raf raf ?image/x-icon ico +?image/x-jg art ?image/x-nikon-nrw nrw ?image/x-panasonic-rw2 rw2 ?image/x-pentax-pef pef @@ -117,7 +119,7 @@ ?text/x-vcard vcf ?video/3gpp2 3gpp2 3gp2 3g2 -?video/3gpp 3gpp +?video/3gpp 3gpp 3gp ?video/avi avi ?video/m4v m4v ?video/mp4 m4v f4v mp4v mpeg4 @@ -153,6 +155,7 @@ audio/mpeg mp3 mp2 mp1 mpa m4a m4r audio/x-mpegurl m3u m3u8 image/jpeg jpg image/x-ms-bmp bmp +image/x-photoshop psd text/plain txt text/x-c++hdr hpp text/x-c++src cpp |