tree 7c56399a7af8ed1e0a0823548805aae693689383
parent 39269044068d9710153d79b938c0648d3770ff98
parent de91986395577ee1e791d0b2b5f83c27c6a022d7
author Bill Yi <byi@google.com> 1563185757 -0700
committer android-build-merger <android-build-merger@google.com> 1563185757 -0700

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

Change-Id: Idfa28535cb520e832521a10bdb0193a53c603d80