diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-08-21 22:31:12 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-08-21 22:31:12 +0000 |
| commit | 903ed6ea7826f8076030b7bd766157c2237e25d5 (patch) | |
| tree | 771dc12a8cb9cd793c4b2b15a219076e3d0c92a7 /tools/aapt2/java/AnnotationProcessor.cpp | |
| parent | 8293d8aba7f5d88623e5533e29347e9a147946c0 (diff) | |
| parent | d379a76ad41c7ea3e77c382603e8084be9e90506 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-d1-dev am: d379a76ad4 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12423850
Change-Id: I73c4d09dee36a0eac51096cb00ecc913d885f430
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor.cpp')
0 files changed, 0 insertions, 0 deletions