diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-12 18:02:03 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-12 18:02:03 +0000 |
| commit | b778e99951529713c8452102f9fdb9e88e272949 (patch) | |
| tree | c70887f37e0e662ad794545a041b5f10e31f10b5 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 559601bc20dad8555e8d531ed2742b86161c35e9 (diff) | |
| parent | a700a7037237371ad527dc49dfb544058642bc2c (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: a700a70372 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14158295
Change-Id: Ifbaa5b4ac82f9904e9f293195050883e4763e041
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions