diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-05-02 02:31:08 -0700 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2019-05-02 02:31:08 -0700 |
| commit | c965cc37c52193bc486d55c72a06a84a61bbd23c (patch) | |
| tree | d4f1ebbb939e8302723e519b86d5f358b2fd5ab1 | |
| parent | 0c3270a956464973c14de319d7552a61e90f78fe (diff) | |
| parent | 6aba3322c66b5a08680deba9aface5b8c647b37b (diff) | |
Merge "android.mime.types: canonicalize video/MP2T to lowercase."
am: 6aba3322c6
Change-Id: I032f51e812b68b00dccdb56a3e6e2f2710b780e9
| -rw-r--r-- | luni/src/main/java/libcore/net/android.mime.types | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/luni/src/main/java/libcore/net/android.mime.types b/luni/src/main/java/libcore/net/android.mime.types index dff930ad67..505afa59a8 100644 --- a/luni/src/main/java/libcore/net/android.mime.types +++ b/luni/src/main/java/libcore/net/android.mime.types @@ -68,8 +68,8 @@ video/3gpp 3gpp video/avi avi video/m4v m4v video/mp2p mpeg +video/mp2t m2ts mts video/mp2ts ts -video/MP2T m2ts MTS video/x-webex wrf # Special cases where Android has a strong opinion about mappings, so we |