tree 1219091e2f073139b2cf0bd0199a44e86ef5e84b
parent 45ec14c06f2ecc83473bf44c2f596b5b5e19de6a
parent c1591ce4868c616d3934ba9cfae2b7401bb39ee0
author Bill Yi <byi@google.com> 1563693813 -0700
committer android-build-merger <android-build-merger@google.com> 1563693813 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 69d1c9c037 -s ours am: 2968a449bc -s ours
am: c1591ce486 -s ours
am skip reason: subject contains skip directive

Change-Id: I6c4bba1701a92d70b1be32b52b957c883a0bfc54