tree f89369aa44b2c3511681fe52bfa03a3deda49939
parent bc9d86ab5a2033657ad721846850561bc13f939a
parent 8237048fb0da55f732325f81b57b198b559995d0
author Bill Yi <byi@google.com> 1564164194 -0700
committer android-build-merger <android-build-merger@google.com> 1564164194 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 55a5388280 -s ours
am: 8237048fb0 -s ours
am skip reason: subject contains skip directive

Change-Id: I01bd7e707b7758d8221db45dd341f0b3745947df