summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 17:08:11 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-23 17:08:11 +0000
commitf29cf4a8c31bad6055ebc3d12b9d7363ffb8d950 (patch)
tree792a42b8364bdd09d0ed0f559c7b804ef066b5d1 /tools/aapt2/java/JavaClassGenerator.cpp
parent49d152a71191440d8fcc6599400fcacd851495ef (diff)
parent56fa460b1a862a257750c7b9fa56a0f19a1319d9 (diff)
Merge "Merge "Override MIME type to match MediaStore behavior." into rvc-dev am: 38a6333ff6 am: 1939ad73cf am: eac11fa9c4" into rvc-qpr-dev-plus-aosp am: 56fa460b1a
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11962282 Change-Id: I223a183847f90d1df3289fd3631cd7ecc8a8c521
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions