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-16 03:31:36 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-16 03:31:36 +0000
commitb065db932a8b84535de5a1d921c3a7afe1e6b6db (patch)
tree7729bdb9b5cbb0ea57f7299e61d5d34766e45709 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent8702178b2abc57260046ac43e86bfc69816d8ca2 (diff)
parent6c84521962963a4cf367e1bed229c9f78a154daf (diff)
Merge "Merge "Ensure detached children aren't parented to new SurfaceControl" into rvc-dev am: ac3ce5c425 am: ae3ad24751" into rvc-d1-dev-plus-aosp am: a5908b9df1 am: 6c84521962
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11817537 Change-Id: I2247cd4464216befd07956a89c73a8a35b039661
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions