diff options
author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-25 14:55:14 +0000 |
---|---|---|
committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-25 14:55:14 +0000 |
commit | 020da3708327e30fc7f311ef04e8ae6a2418d1e2 (patch) | |
tree | 7bdf9a4de5fee989dcd655a52a683ea03090da9c /tools/aapt2/java/AnnotationProcessor_test.cpp | |
parent | e1ef5371f2218a41ad89c3c196e9f9b28eabd4ad (diff) | |
parent | b1265ab0fedb5cdd287f5aa91fe3fde1afd9e374 (diff) |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: c8e7ceeb71 -s ours am: b1265ab0fe -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12230450
Change-Id: I399db6fe1bddc074f29cfc05f5a9967136e2991a
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions