tree 05129aca88c7bd8212c0fb6a20fffa32acc1020f
parent 299fe08e17800abeebaeb73a02da8ff868826557
parent 73e4e858b5686308aad34f867ccc0b86344574e9
author Bill Yi <byi@google.com> 1566093908 -0700
committer android-build-merger <android-build-merger@google.com> 1566093908 -0700

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

Change-Id: Icd42f6c16a88764105487ca6a045b6731ca38989