commit | 61e036086bbc3ddb723055c099499026ef546c3c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Wed Jun 05 15:42:34 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Wed Jun 05 15:42:34 2019 -0700 |
tree | 16d43c81e13c726eeafc2343820407220fde505f | |
parent | 5c72d4a7491f827af3cc0855ca70d9a6e8b9589d [diff] | |
parent | 5c18f503a6361a9827169db50d380e10088aca37 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: d10a92f20c -s ours am: 5c18f503a6 -s ours am skip reason: subject contains skip directive Change-Id: Ida1209c828dee4ca3520333b0ea94c2fc54dd71f