tree 0b94dea0e0d083bf760f9e43e2b0f5441fce523c
parent c90f257ac1dc792eb47e06ea3b137b66c2c7afdb
parent 3bef14d1d5dec6a144dca81a7ae239750c772f25
author Bill Yi <byi@google.com> 1569885305 -0700
committer android-build-merger <android-build-merger@google.com> 1569885305 -0700

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

Change-Id: I367a9a7ed5ea28ee5de6c344a9dd539033e06242