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