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-03 18:22:49 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-03 18:22:49 +0000
commitd88fcacbd1d9204cf337c3d35671e841a508a775 (patch)
tree197d973cbabf56ee181d0916e5fcbf0005a25c3d /tools/aapt2/java/JavaClassGenerator_test.cpp
parentf1e46206695a01124d403940f45651278fc909c0 (diff)
parentc763b3d2ceaf1e3f227e7f1233fa1a0bf5cf16dd (diff)
Merge "Merge "Controls UI - Wait for callback to potentially show controls" into rvc-dev am: 0d425c2e4e am: 261faac8ba" into rvc-d1-dev-plus-aosp am: c763b3d2ce
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11702453 Change-Id: I27b63d709d07432372424a5f826fe22ecba9140f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions