commit | d32cc0a359c0dc25ec2f26b77bf42622c489bf4c | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jul 15 03:19:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 15 03:19:19 2019 -0700 |
tree | 7c56399a7af8ed1e0a0823548805aae693689383 | |
parent | 5ebc5f514d2d3f3d5be74a6adb1aaad88fd8c059 [diff] | |
parent | 10eba2aef3f46c43e5205123591333a832571618 [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 1f6fbcdef3 -s ours am: 2264e1ce5e -s ours am: 10eba2aef3 -s ours am skip reason: subject contains skip directive Change-Id: Ia4f042de5e2fa3133372e0d06fbd42152a99c67d