tree 450b55f1d819d3fa2eb75908073bddd56a6b8f90
parent 0c65fb0931d379a765f6e4dfb58e6baee197abba
parent b3b93d72fbafaf724de171a947ccf3a7710987a7
author Bill Yi <byi@google.com> 1559450792 -0700
committer android-build-merger <android-build-merger@google.com> 1559450792 -0700

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

Change-Id: Ie05e225f4a0ce0bb00b05fbef0768843f7504f49