diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-07-19 15:46:20 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-07-19 15:46:20 +0000 |
| commit | c5d5494f3f45c754ba6a2eda6bd6c9965abfcb1a (patch) | |
| tree | 7f69384acaac3e5b33676fa3a0f5529b3a041e80 /tools/aapt2/java/JavaClassGenerator.cpp | |
| parent | db12884a81098fe46508fac469d67705b590af50 (diff) | |
| parent | 26fd2e1ba1dc85e680bebed54d8dc7bc8abb2f87 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" into rvc-dev am: d3f766ee0f -s ours am: b94d0f3187 -s ours am: 361164f977 -s ours am: 26fd2e1ba1 -s ours
am skip reason: subject contains skip directive
Original change: https://googleplex-android-review.googlesource.com/c/platform/frameworks/base/+/12187676
Change-Id: I336810185d20a9f2fc4df8bbeeca6b076856abae
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator.cpp')
0 files changed, 0 insertions, 0 deletions