tree c2ab710805b1f169f158be1a514a7a3ad79344bd
parent 73cec17e36a1505424cda1a62f7c290be29b615e
parent 35d50b84a62164954af15c70182a9b7df975d837
author Bill Yi <byi@google.com> 1562967948 -0700
committer android-build-merger <android-build-merger@google.com> 1562967948 -0700

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

Change-Id: Ic9be380a139d6ad010b3b41f28670841050d01e9