tree 8cb3989e4f3e18ad83c62212e7941ccf0d7e92ad
parent f377d2c58a1da521221b2b2bb2bf6685b97c4d56
parent 99a10329949046515bfc7daaa607ee3f977d3692
author Bill Yi <byi@google.com> 1563918727 -0700
committer android-build-merger <android-build-merger@google.com> 1563918727 -0700

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

Change-Id: I5c8366909ff63c6446d40e79289cbaa524cd253e