tree 6ac88f58c5ea1ae7341448b23329df90dd609fb6
parent 27c67b2bf12ccf76526e866a332206eba7f1df24
parent bde6a92a5537d86a85eee69fee47dc04ff06a428
author Bill Yi <byi@google.com> 1563824003 -0700
committer android-build-merger <android-build-merger@google.com> 1563824003 -0700

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

Change-Id: I2b84532c9db62f7155bd4683d9b0b02484f93271