commit | 156c45f05097b253124f68bf85ef5b197cf46ce2 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Fri Jun 14 01:42:23 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Fri Jun 14 01:42:23 2019 -0700 |
tree | 6dec01bae8f1624af3aea01c135e56e9269c9496 | |
parent | e55e0f9324838ce882f939b557b2fc9c47709522 [diff] | |
parent | eb1691eac91647f1f75ccc671e7b3c666b3b73bf [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 9eabbc0e48 -s ours am: eb1691eac9 -s ours am skip reason: subject contains skip directive Change-Id: I8dcfc66e2eadd8c7efaf51b46d961499d0e8c300