diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 16:27:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 16:27:07 +0000 |
| commit | fc8d11d4316af489ef854568c4f9bc1679f0613a (patch) | |
| tree | 5d34087236ff89637ac5a201ecaefcda11ecdc72 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 902477724aec8268d73b1f3dbf257f2a2fe2d86b (diff) | |
| parent | 79b99b4cc7bd99ddf276ba1308bfa77fc9ecc31b (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 79b99b4cc7 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14173308
Change-Id: I6235ca223d068ff9d4baf35cc7579a6145da29d1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions