diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 19:38:09 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 19:38:09 +0000 |
| commit | 4418c89f5f180d1fb3d2bdeb472f8eb44e9601b0 (patch) | |
| tree | 274d4692a038259d849da4d86f1ede1a4a8b0916 /tools/aapt2/java/AnnotationProcessor.cpp | |
| parent | 792511717e6732d9bd1ccef1ddd70e902407efe6 (diff) | |
| parent | 76783bbe3471c0c880cbc824fe8b7b903b4ba8da (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: c294687770 -s ours am: d2d3a20624 -s ours am: 76783bbe34 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12188942
Change-Id: I0f5edaee7016bc440ff79de1e9b0aa113378b1fc
Diffstat (limited to 'tools/aapt2/java/AnnotationProcessor.cpp')
0 files changed, 0 insertions, 0 deletions