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