diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2021-04-13 17:46:22 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-13 17:46:22 +0000 |
| commit | 04561e7472c283a36b66eca9d3ab660d65e95f8b (patch) | |
| tree | 6257271a43930c653cdabf854a250b727f51dc7c /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | f6febe9b6566205074451f37a0460ad7b24edf51 (diff) | |
| parent | b720d6166c331482116390dfab2b1eec96d261cb (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into stage-aosp-master am: 60dde1dd13 -s ours am: b720d6166c -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/14165557
Change-Id: Icd5d8d4b8760fd62fe3a36400fce726cc3232d17
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions