tree 43ab5e36d99055ebb8fa0d159a925cf4e14f9d4a
parent 26aba21b435be548bede5cb729d8bdb1c25238da
parent bca28ead67368d1e9d161268e58c442eb2642477
author Bill Yi <byi@google.com> 1561942272 -0700
committer android-build-merger <android-build-merger@google.com> 1561942272 -0700

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

Change-Id: I3d816a129597f5bd27794d6c8756a285d13edb42