diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-06-18 20:39:42 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-06-18 20:39:42 +0000 |
commit | ac0fb6ab39e23298b3dee5e68deef669b4f5330a (patch) | |
tree | dbe9cf22978a71ecb11801e1113017c38cae49f7 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
parent | 00d19a3c2db8b79aa5f5fdae5289b09c6c768671 (diff) | |
parent | 4b3a1684aa671dd11ec52c9c90d5af729d223683 (diff) |
Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 82d75b27d9 am: 220b9a18fa am: 4b3a1684aa
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480
Change-Id: I05a326f0a415be29ae40d90019b16b43c6ac0568
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions