tree 6e996c64764e91bdbd2ab557171e6f91893711d2
parent 15e3beb0ce1f23a58875acb8bf6f590515bdd8dc
parent 6f1fc7fd3fe3a80cfac0c1ada6f75b1f8cd3369c
author Bill Yi <byi@google.com> 1566061008 -0700
committer android-build-merger <android-build-merger@google.com> 1566061008 -0700

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

Change-Id: I41e1560312cddc53029f10040e2dd25daf33b975