tree 563501b2c6f0fd8dc458891be2afba0482ffde8d
parent 01cd18b87ca1486786b76dba872d87c89eb101ab
parent 8cf0a06fa85af8679e9a6e22ab73b3b05d0cd043
author Bill Yi <byi@google.com> 1559972203 -0700
committer android-build-merger <android-build-merger@google.com> 1559972203 -0700

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

Change-Id: Ifcd08e8339720aa7109ef51d89ea3a6b7daf00f3