tree 3d4c7d05b532a7d542fc21abfc02db825fb91f27
parent 545a4c369e295ff458a4616ea434e822f39ced35
parent b0eb9621324f71ef5b64f3c8f524e28cec56cd67
author Bill Yi <byi@google.com> 1562973774 -0700
committer android-build-merger <android-build-merger@google.com> 1562973774 -0700

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

Change-Id: I658c3f3345eead84d37f7922fdc66ce55750101e