tree 31fd903b1ba1ee34128db8275cbfdf90ce602b92
parent 73e4e858b5686308aad34f867ccc0b86344574e9
parent 4769e819e9ec55f5d2925c5783fb82b887c000bc
author Bill Yi <byi@google.com> 1566112564 -0700
committer android-build-merger <android-build-merger@google.com> 1566112564 -0700

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

Change-Id: I28086d495911ad8df40e2e77bc888722864cec48