commit | 0c6181275b195a62c02839af41981f099ffe1ba3 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Oct 12 11:06:01 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Oct 12 11:06:01 2019 -0700 |
tree | 971103a8ee9d4c50783f078b72b016c77998c6b2 | |
parent | 72b8877c8292b74783c5713d81cf630da1cd339d [diff] | |
parent | 37c765eb20b46bb194f8298542a83f8aba6791c4 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ea59105148 -s ours am: 74cc0f8c3e -s ours am: 37c765eb20 -s ours am skip reason: subject contains skip directive Change-Id: Ia4d0103d00f9a03bc202f0a0f61b292d9d83d922