diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-12-05 02:18:02 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-12-05 02:18:02 +0000 |
| commit | 7ca181e71b9f7da157ce682aca58e420771fff5a (patch) | |
| tree | 9a076411ea2a4756a226ce8b6ef000436b1e5e87 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 804946ff28ecd4782f7c699f27207550b22a9017 (diff) | |
| parent | 52274b08b85a89b63400d9f2ec7c14a7e754892c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 52274b08b8 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/13169685
Change-Id: I7eb31730dc8b033ba9d567d5d1824ddee9d25a29
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions