tree 50a4e715a7b694074e27149b84a58eefd5b58c8d
parent 904bba5e1e7a83d1eac81fa9153701c146f95c5b
parent 0d200f3d18419b9752919f0025d762dc7d73a0ae
author Bill Yi <byi@google.com> 1565150158 -0700
committer android-build-merger <android-build-merger@google.com> 1565150158 -0700

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

Change-Id: I63d5149da0b1657a976be5004f2199b0ec798068