diff options
| author | TreeHugger Robot <treehugger-gerrit@google.com> | 2020-05-18 23:41:14 +0000 |
|---|---|---|
| committer | Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com> | 2020-05-18 23:41:14 +0000 |
| commit | 60e83f5f5b7f632815d4a766dccdcedae78e4b60 (patch) | |
| tree | c16715a40d927bd3553ff751f48176cfe0258109 /tools/aapt2/java/JavaClassGenerator_test.cpp | |
| parent | 7e8371ab26de26176cdc45e7c94a43f7f90fcac7 (diff) | |
| parent | 83afbfef41d5b38411e2a8a05b4c79bc6e223656 (diff) | |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 0f05db89c3 -s ours am: 5b04790e16 -s ours am: 5c5440a0ea -s ours am: 83afbfef41 -s ours
am skip reason: subject contains skip directive
Change-Id: I38a3f5c296e975aaedd5f123392e47c63ec4a7dd
Diffstat (limited to 'tools/aapt2/java/JavaClassGenerator_test.cpp')
0 files changed, 0 insertions, 0 deletions