diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:31:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:31:09 +0000 |
| commit | f1a6379b9978fd752dbb8992a440fa8699912f9a (patch) | |
| tree | 29fdec4fa5440b773b96f4c387bd4aa0582db251 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 86b24981f807af008832e8b3e5b5dd75c43d538f (diff) | |
| parent | 0a2e94c1b45eac42d621fa4f1059f79d680df3a3 (diff) | |
Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 766a8501b5 am: 0a2e94c1b4
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480
Change-Id: I45d7b220c37ed8f47dde48c20637805fa04a573d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions