summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorTreeHugger Robot <treehugger-gerrit@google.com>2020-06-18 20:29:35 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-18 20:29:35 +0000
commitd9dae0cf766dfaea4d2d3bdff2fb28e096e7c2d5 (patch)
tree29fdec4fa5440b773b96f4c387bd4aa0582db251 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7f190ea5935ebbdb2db66ac972e26c116b0634b2 (diff)
parent1ae6c9f481116a4b622337e367477bf75409da32 (diff)
Merge "Add additional optional audio/x-mpeg MIME type to MIME type map" into rvc-dev am: ed44012906 am: 82d75b27d9 am: 1ae6c9f481
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11899480 Change-Id: Ic62f07636e638fde4f6716f07458b2b57a0350ac
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions