commit | d851c0d8c984b43bb844180e9bb0ef2de767287b | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jul 22 13:31:19 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 22 13:31:19 2019 -0700 |
tree | b6136d03b452407d1165ba8086826c1e39fa3eb7 | |
parent | b4fe7b070ff416c48e422e3f42e1cc5355ea1cb4 [diff] | |
parent | 4e48fd226e829ca57d55009dba98bb258ff5ef8a [diff] |
Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours am: ae841ab54e -s ours am: 4e48fd226e -s ours am skip reason: subject contains skip directive Change-Id: I57b47245565825365356233e97a5ee70ca874e13