tree 04407f43602932c221f41884bd8255f04472ed8b
parent 2e463f4b42f5c447cc4fe96f5453fe7020827d8b
parent 2a6dabcd6a0b9f6dd4bb7e3e5c29ae869da702af
author Bill Yi <byi@google.com> 1565084022 -0700
committer android-build-merger <android-build-merger@google.com> 1565084022 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 3ca8c70e38 -s ours
am: 2a6dabcd6a -s ours
am skip reason: subject contains skip directive

Change-Id: I28f28a12fb554a2791fff10d83bd30399c49a34b