tree fefbadbf9f76394b92c3ec6d372aa4183a2b6894
parent 33ab3773509b756847306921b154df6d51fc644c
parent fa09b59f61bb3d913c8a1e0042ef44d78d954b6f
author Bill Yi <byi@google.com> 1559401640 -0700
committer android-build-merger <android-build-merger@google.com> 1559401640 -0700

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

Change-Id: I2fd01e7f7f8285e1bb9aff7eccf3239d19b40226