tree 1eb15d1f0278705adc62516ab3add9fab61f9e88
parent fb900c8432cf0ecd6f222a224e8dd9d4194133b5
parent 0906e02aa3443d33b8929469452cc231c8f5220b
author Bill Yi <byi@google.com> 1559697862 -0700
committer android-build-merger <android-build-merger@google.com> 1559697862 -0700

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

Change-Id: I32e5d4d452538b501d9b538e188316dab0548f45