Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit c08fd46f authored by The Android Open Source Project's avatar The Android Open Source Project
Browse files

merge from open-source master 

Change-Id: I4ddfc902e70c85ab8b11698fc08df7247e46d0a9
parents 3c259d32 9226a713

core/java/android/webkit/MimeTypeMap.java

+3 −0
Original line number Diff line number Diff line
@@ -369,10 +369,13 @@ public class MimeTypeMap { 
            sMimeTypeMap.loadEntry("application/x-xfig", "fig");

            sMimeTypeMap.loadEntry("application/xhtml+xml", "xhtml");

            sMimeTypeMap.loadEntry("audio/3gpp", "3gpp");

            sMimeTypeMap.loadEntry("audio/amr", "amr");

            sMimeTypeMap.loadEntry("audio/basic", "snd");

            sMimeTypeMap.loadEntry("audio/midi", "mid");

            sMimeTypeMap.loadEntry("audio/midi", "midi");

            sMimeTypeMap.loadEntry("audio/midi", "kar");

            sMimeTypeMap.loadEntry("audio/midi", "xmf");

            sMimeTypeMap.loadEntry("audio/mobile-xmf", "mxmf");

            sMimeTypeMap.loadEntry("audio/mpeg", "mpga");

            sMimeTypeMap.loadEntry("audio/mpeg", "mpega");

            sMimeTypeMap.loadEntry("audio/mpeg", "mp2");