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