summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/JavaClassGenerator_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-29 17:34:32 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-29 17:34:32 +0000
commitb63bf73cf751100753abc0e94bdd9cd23f8a6d56 (patch)
tree8cb2372bc5e6aae236c3469683bfb2993f2f88c5 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent3de8b008d8ee415955c0fb913ab873d322629311 (diff)
parenta932636e76f7a94bd89db4b0bd5bb45fb0543040 (diff)
Merge changes from topic "am-741f8472fc2540b58147ecfdb6b79484" into rvc-d1-dev-plus-aosp am: 61b4ea3a11 am: a932636e76
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12004859 Change-Id: I3547c0bedba238a85b34b50e941540663531fe37
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions