tree cf17ac0bd689d4fb93933dcb224b4f4a2b2e0b5f
parent 8756d94745401452e506d5ad4c47482d0e55a93c
parent e6495d48308451539c61b81c62766b312222545f
author Bill Yi <byi@google.com> 1566624404 -0700
committer android-build-merger <android-build-merger@google.com> 1566624404 -0700

Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: b7ad07adad -s ours am: 7002e2a912 -s ours
am: e6495d4830 -s ours
am skip reason: subject contains skip directive

Change-Id: I514e2f0dfda041042ed79496bcc49afe0e4d603b