summaryrefslogtreecommitdiff
path: root/tools/aapt2/java/AnnotationProcessor_test.cpp
diff options
context:
space:
mode:
authorAutomerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>2020-07-21 20:07:56 +0000
committerAndroid (Google) Code Review <android-gerrit@google.com>2020-07-21 20:07:56 +0000
commit561722247abdc146e83c3c31d63e28860924a8a9 (patch)
treee09d00a91d642651c1d579625121cbd76dbf515c /tools/aapt2/java/AnnotationProcessor_test.cpp
parent6b317fe8cf4b72a6d63f30978c7754be8a6fb64a (diff)
parent658d3580d5e28b551e5f2e01b65a7bdcd9bd5443 (diff)
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: 8bf888c7e9 -s ours am: ccaa8826eb -s ours" into rvc-qpr-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions