tree 735292985d442395d62b6408c811537387acce47
parent cd682aab861f7522d8912ded80e61a4d743e586b
parent cff43892cefcd34daf2e873e4f987606358ad460
author Bill Yi <byi@google.com> 1564164816 -0700
committer android-build-merger <android-build-merger@google.com> 1564164816 -0700

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

Change-Id: I7cc02368687a025cee1e6b7f52ce3d56bc23e9cb