diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 23:26:26 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 23:26:26 +0000 |
| commit | 70bc4757b503508ea066bfd0ca92b4717b988ebc (patch) | |
| tree | bd150421f6da244bd11ade3040a8f59f9d9d8222 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 6517e68d15ef47970e5be16f6b9b4a317394c19a (diff) | |
| parent | e84e3c9919afb3365bc561ecf38d967252db61ea (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 1678346f96 -s ours am: e84e3c9919 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14163574
Change-Id: Ice87d59e125bd29469f598ea0ac0dcd4755f672c
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions