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