commit | d4f48b689a48d793a53843f5fe70b0660e271aa0 | [log] [tgz] |
---|---|---|
author | Bill Yi <byi@google.com> | Mon Jul 22 12:55:29 2019 -0700 |
committer | android-build-merger <android-build-merger@google.com> | Mon Jul 22 12:55:29 2019 -0700 |
tree | 73d3de2e6e3551141e22c9c890698ac838e5279f | |
parent | 50daa9a78f68b21de217536441d1c6aae85feb77 [diff] | |
parent | ae841ab54e26109c39867a51aae67fefe4a2e3b8 [diff] |
[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: bde6a92a55 -s ours am: ae841ab54e -s ours am skip reason: subject contains skip directive Change-Id: Ifb177da0da34e78960a0e5929f8738d46d8883af