diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 21:12:47 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 21:12:47 +0000 |
| commit | 70f6ced807f44ef97444f21f2ec263aa8acb3484 (patch) | |
| tree | f9945a92029a6997aafb3ba92dd8c4596bae14aa /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 23fbae438df1d3875c2fe880e3353c30fdfb87e6 (diff) | |
| parent | 4aed3924ff3ee05a6d673dc8c69eb84d1c6da10a (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: e841b21a2d -s ours am: 4aed3924ff -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14174616
Change-Id: Iac361b2a294578a5dc95464e7fb529d010e4588d
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions