diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-25 15:20:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-25 15:20:07 +0000 |
| commit | 56e54711d625b8a7df6c0fa945d8f246aabb3ba1 (patch) | |
| tree | 65fb43df459f18984138b9e99d3941f6297c02a9 /tools/aapt2/java/AnnotationProcessor_test.cpp | |
| parent | a0b1272872ff42688104c7982775df77361c35c8 (diff) | |
| parent | 486e4a47cdb9f1263727aada5b5bb0f7a88525e6 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-qpr-dev am: 486e4a47cd -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12232477
Change-Id: I8abe375ad5802cfd25c8d3449210c0d7076d9543
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor_test.cpp')
0 files changed, 0 insertions, 0 deletions