tree 364d508fecf5e74b5761c779157ce4919a462b05
parent a2b17defcec2ba068a5e814cc5361656b4af5381
parent 9070e5ab3adda11a13d4e5d3ded6792d8bcbf355
author Bill Yi <byi@google.com> 1559401438 -0700
committer android-build-merger <android-build-merger@google.com> 1559401438 -0700

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

Change-Id: If8115abd43afe20aed1867d52f554016e14951ed