tree b6136d03b452407d1165ba8086826c1e39fa3eb7
parent cc814f774c924d304c3fa03244264d0fc7790fed
parent 167cb383b63772c10b4ba8e1b991e3f9c454aa8c
author Bill Yi <byi@google.com> 1563827063 -0700
committer android-build-merger <android-build-merger@google.com> 1563827063 -0700

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

Change-Id: Idddff624b8f352cef74b0281b8a35cc60c6fb5e6