diff options
| author | Tobias Thierer <tobiast@google.com> | 2019-05-21 19:56:14 +0100 |
|---|---|---|
| committer | Tobias Thierer <tobiast@google.com> | 2019-05-21 20:01:09 +0100 |
| commit | dfd2e38d001be663706e29a4ed9db03f8e5d484b (patch) | |
| tree | d176e7b82c06763995a8bec568ae54b4055fe026 /annotations/generate_annotated_java_files.py | |
| parent | 1547c9b0ac236828aedc5efec1c2ca4fbee99d45 (diff) | |
android.mime.types: Add application/x-wifi-config.
This is an Android-specific MIME type that we want to map to the
file extension .xml.
The .xml file extension already maps to text/xml and we want to
keep it that way, so this CL lists the new mapping first in order
to not interfere with that mapping. This is enforced by the test.
This CL is a backport of http://r.android.com/964563 and only
suitable for branches that do not have that commit, as expressed
by this CL's Merged-In line.
Test: atest CtsLibcoreTestCases:libcore.libcore.net.MimeUtilsTest
Bug: 131913690
Change-Id: Ib7f93ea91c7360e76ecef0542c38d60185525e44
Merged-In: Ib7f93ea91c7360e76ecef0542c38d60185525e44
Diffstat (limited to 'annotations/generate_annotated_java_files.py')
0 files changed, 0 insertions, 0 deletions