tree a3132bfc17cebc70cc04c6422fd4bd98baa3b639
parent 6d3d9db274f015c38b7c1849c28318b982272d00
parent 8c7a9b95edc1eb31a9e0f9f19c972a6c0ad56fb5
author Bill Yi <byi@google.com> 1556639571 -0700
committer android-build-merger <android-build-merger@google.com> 1556639571 -0700

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

Change-Id: Icd3e27d1584438c00050e065d183b04ea2432fab