tree 952b37c5992a0466e85325259fc58b07c220a84b
parent af1984944b2c54d19096ef844e24e2e4cefcab56
parent fcb0fc436c476b922c913394238d8225d0733c90
author Bill Yi <byi@google.com> 1561477115 -0700
committer android-build-merger <android-build-merger@google.com> 1561477115 -0700

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

Change-Id: I2d9c5e4a863f324c8b8504556a1e85d0e8c777f7