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