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