diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:41:07 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:41:07 +0000 |
| commit | 7e8371ab26de26176cdc45e7c94a43f7f90fcac7 (patch) | |
| tree | c16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 3c54069f1bf6aa5e319599753c016d55809d1f60 (diff) | |
| parent | c6715e931395e4f33f4f7b0cd24988dd86892c29 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 65e9e82b3e -s ours am: 784cb61c9b -s ours am: f446c04ffd -s ours am: c6715e9313 -s ours
am skip reason: subject contains skip directive
Change-Id: I41d8713b564be9dccbf1134ab48b59abbacdb058
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions