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