diff options
| author | Treehugger Robot <treehugger-gerrit@google.com> | 2021-04-22 21:23:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2021-04-22 21:23:24 +0000 |
| commit | 7a9d7c3b12b1f389bd5095d51205f08e6d68ce8d (patch) | |
| tree | 87611a13927dbbd03ed3a6efe9f44700c433b172 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 552d78d3521d36fed7dfe71e94c4b0489b18fd60 (diff) | |
| parent | 446ade313529c68d807976512ff021edee6d2ac2 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE ANYWHERE" am: f975580f62 -s ours am: 446ade3135 -s ours
am skip reason: subject contains skip directive
Original change: https://android-review.googlesource.com/c/platform/frameworks/base/+/1684936
Change-Id: I61a9bbc24b3e8cee87610ea6f74604c0347f0aa6
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions