diff options
author | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-21 19:48:26 +0000 |
---|---|---|
committer | Android (Google) Code Review <android-gerrit@google.com> | 2020-07-21 19:48:26 +0000 |
commit | 87cfefce3ed88d29fa7aeae01fe7ade2bc0b9f0e (patch) | |
tree | d299467b0520602fb3d0ad08fcd7bee51991c8d4 /tools/aapt2/java/AnnotationProcessor_test.cpp | |
parent | 26cf70ebd3b47db344944c29f00f59e8e008d081 (diff) | |
parent | 3eae26d4e50bd3e185072e2a0eced78360c55b47 (diff) |
Merge "[automerger skipped] Import translations. DO NOT MERGE ANYWHERE am: 2414b21d4e -s ours am: 5bef533f30 -s ours" into rvc-d1-dev-plus-aosp
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions