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