tree deb206a7efa6231977dad27724f53ceb613b63bc
parent abb7a328aeb4f2b71d78075bedf0464f51cdeec2
parent adf3b1bbf70719e5af19e56eb77e5b3e1887fb86
author Bill Yi <byi@google.com> 1563487721 -0700
committer android-build-merger <android-build-merger@google.com> 1563487721 -0700

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

Change-Id: I62ceea6b46cee23ea9d2ffaca92c6062c21553e6