tree 99148fe3d821d964f3f9656be8d00779f7643d62
parent ecaa821f3dc02b77b02a38d71bc56fb078221a3e
parent 47331f145138822578bb0e9c29d6cd4795f7f2cb
author Bill Yi <byi@google.com> 1565159315 -0700
committer android-build-merger <android-build-merger@google.com> 1565159315 -0700

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

Change-Id: Ie3eccf74b1805f84f7f1e4e23bccb5f1d50c4d17