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