commit | 88a7aeec4ccd3d25d82e0a0e53e9d1659673f4db | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Sat Apr 06 23:42:09 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Sat Apr 06 23:42:09 2019 -0700 |
tree | 62954de8a14d38f812859c839d055c87b2f09815 | |
parent | 8a5ef6033338cfe1ebc31a220fc889685647a970 [diff] | |
parent | 1eebe4bd30b6dac80327005ca49ddc4699da3e21 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bd99f25f94 -s ours am: 1eebe4bd30 -s ours am skip reason: subject contains skip directive Change-Id: I0c22564095a1d9695a4e393ea932bec73f5d6d21