tree 5fc92f94166edb70c3e79e0bd64200e9ff0a6b17
parent 5bb4b60470bee5fbd72e5aed8733a5ee17651057
parent b40388981893e51f53a581cc519feeca4fc96c61
author Bill Yi <byi@google.com> 1563144916 -0700
committer android-build-merger <android-build-merger@google.com> 1563144916 -0700

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

Change-Id: I2437556ccbcaf0d5595f3269a7b6f8fad12cf1b9