diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-19 00:02:24 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-19 00:02:24 +0000 |
| commit | bd9ab1a4d2eb30f46399442b4324cc369f825261 (patch) | |
| tree | 1d2f1d4858e6fedf96a6af91a5f42bf5f1664df4 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | a5d9ace6bcdb3a3d9f7f7f759c43824640da2017 (diff) | |
| parent | 2594fee8a3648ca7e5c915cd1731346e5c7f6aac (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: 2594fee8a3 -s ours
am skip reason: subject contains skip directive
Change-Id: I403d1cc6631b5c3a9fe3893406359092e185370f
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions