tree c96026d28228dc651ff285974df290769014a7d4
parent 215ab44f1c2915852ee78ed85c2181b8a6310dcf
parent 9b824e7809079e3f007be1f25052e219780dca67
author Bill Yi <byi@google.com> 1558358943 -0700
committer android-build-merger <android-build-merger@google.com> 1558358943 -0700

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

Change-Id: I50c080de7fb24a0f3ea277e6b03c9666bf19d0ec