diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 19:38:46 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 19:38:46 +0000 |
| commit | ff696632458e47b6b49e2695324b635930a7c605 (patch) | |
| tree | 46722e29358f6eb0eb8b41b870086e52cc440409 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 1689cdd1cb00f96b373401fa9132fa4a58bd5883 (diff) | |
| parent | ba3a4a3680fddc51bbe89bb985e271b12fcfdbdc (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: ba3a4a3680 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684629
Change-Id: Ifdf9131467b08d2c6e2b26c43b9b6e2f4e6b019e
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions