diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:43:55 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:43:55 +0000 |
| commit | 2594fee8a3648ca7e5c915cd1731346e5c7f6aac (patch) | |
| tree | c16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | caf2034e7556cfe6d1c9a9ba0180d9a64dbd93e4 (diff) | |
| parent | a05b3aff7e0a47ff4e6f7be2edde1da13f014241 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0735b26fdd -s ours am: ff6b9350ff -s ours am: be9fee64fd -s ours am: a05b3aff7e -s ours
am skip reason: subject contains skip directive
Change-Id: Id65e12a41c99ca145684cfade1cb36426f71e108
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions