tree 0a39f9304a03385b0fd2e2f4e30ad2f97350d3dd
parent b3be57b74cc15a22e55b346137411dcfc9ef520c
parent 019e1bf3fb7fb61a5793535dbdb2863810fe4686
author Bill Yi <byi@google.com> 1561155681 -0700
committer android-build-merger <android-build-merger@google.com> 1561155681 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 019e1bf3fb -s ours
am skip reason: subject contains skip directive

Change-Id: Iafb62faea41ec53b7e9f0127f64f9e7a2c6af9f0