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-07-08 03:23:58 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-08 03:23:58 +0000
commit5d1744d5a76ce893341eba1393705380475c18b9 (patch)
treedeceb3ccb33dedda19fb63fc9a23d7031fd2d3ab /tools/aapt2/java/JavaClassGenerator.cpp
parent1821fcf044a799d0b27af147e5032218cb14e6d0 (diff)
parent53ee9b88f38921f9839c130dec31b63765a26317 (diff)
[automerger skipped] Merge "Merge "Tweaking workaround to use fallback with null buffer" into rvc-dev am: 5be32a1c11 am: 367b00d197" into rvc-d1-dev-plus-aosp am: 53ee9b88f3 -s ours
am skip reason: Change-Id Ia61809a4dc53317139446d099cfa262c095d2aea with SHA-1 69aebfc9ec is in history Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12100099 Change-Id: I1277e9a7d3821a99ff37615b2ddfd03d3460ea0b
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions