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