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-24 18:56:52 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-24 18:56:52 +0000
commit4a68c7ef327fc36d0e08da3ad1666e9af2344ac0 (patch)
tree1fd2bcef90fb77fb3673f24590edd33750614e6c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent7eebdcf7f3acf243104ceb3b04ba6100eec812f9 (diff)
parent2cf0fb8831d85c9d31c664b4194c4de0770f9b86 (diff)
Merge "Merge "Ensure that ProximityCheck runs on Main thread." into rvc-dev am: 56caddc396 am: 4cdcd9c230 am: d8f00d8146" into rvc-qpr-dev-plus-aosp am: 2cf0fb8831
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11987679 Change-Id: I7e59c8ebadc896decef44373fe26c844d3925bc1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions