diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:41:21 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:41:21 +0000 |
| commit | 9ac7f63d5ae3af3ad3bee949759053a16f53267d (patch) | |
| tree | c16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 60e83f5f5b7f632815d4a766dccdcedae78e4b60 (diff) | |
| parent | b245f6cf2bf316bfbafc09430d3d467c6a846d74 (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: b245f6cf2b -s ours
am skip reason: subject contains skip directive
Change-Id: I7c5142beaebbc0fafc03154a004e7788ff2abcd1
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions