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