tree 3179ede7a47f6b06dcaee961dd5ad7035285b044
parent 3cf1c83e5d6312386115dc6d4a593b60f89a89e2
parent f1d7d5e2d9c92af6f54516b952037f7ac29caced
author Bill Yi <byi@google.com> 1568129901 -0700
committer android-build-merger <android-build-merger@google.com> 1568129901 -0700

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

Change-Id: Ic61fe0bde09a0bb7884b1338e2228d6146c8ff96