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-04 23:22:24 +0000
committerAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-06-04 23:22:24 +0000
commit15d1297ba470a8c7b81517538012dd3bf270b266 (patch)
tree1e34297a3b654894d22aff4cb6943e7addff0f17 /tools/aapt2/java/JavaClassGenerator_test.cpp
parent25a28f8f409cd9f42012b2c7a0eaacc2ff4961ac (diff)
parentbb45a9329c934d6dd664b0d9b47f4ecf145967ce (diff)
Merge "Merge "Correctly initialize recognition events upon abort" into rvc-dev am: 69f12d249c am: af83a66f6d" into rvc-d1-dev-plus-aosp am: bab5df3478 am: bb45a9329c
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/11740392 Change-Id: I9d558f79aac46a3c74f4cf741191c506dc045d7c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions