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