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