tree f89369aa44b2c3511681fe52bfa03a3deda49939
parent f50fdbbf68266380625733fe810088dba3a0f732
parent 55a53882808a24ba3bbe2ed86536c5f2a7142b5f
author Bill Yi <byi@google.com> 1564163527 -0700
committer android-build-merger <android-build-merger@google.com> 1564163527 -0700

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

Change-Id: Icd1efc8c1d4453facedf72c77b80002463de7798