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-22 20:38:25 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-06-22 20:38:25 +0000
commit281a63c0ef7afdd15e95ceb3b6bd4076f98cb9d8 (patch)
tree5c66542da6252a033636e71f1bd067fb1b72400c /tools/aapt2/java/JavaClassGenerator_test.cpp
parent6e4ed6dcb93c980cdd784f4ce85452ba559bdc1e (diff)
parentfab7f734dee1bb6bee753dc3e8859704a18eb00e (diff)
Merge "Merge "Don't intercept touches when the qs scrollview can't scroll" into rvc-dev am: f27737a29d am: 3162f432a0" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions