commit | 2c731e21d045a6a1d21a2d9af708e9d088d9aff7 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jun 24 09:20:50 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jun 24 09:20:50 2019 -0700 |
tree | 0d29bd3ec8d2feda7fecab8bead3b12858f123bb | |
parent | 25391043497e60df1aec3231d6bec295d6d21693 [diff] | |
parent | b8344d6d401aa4b40cdaeb2be11e5f876567f5be [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: e0c262b7da -s ours am: c05f11a0b6 -s ours am: b8344d6d40 -s ours am skip reason: subject contains skip directive Change-Id: If8b07235096e290994721d5e6e3a445d15243a00