tree d322840c50acd665ed0328b68e2c076ccbcc9094
parent a103ad19e1764d08440cf09c99837b588cf2d8e0
parent a08b796130de57e133d73edf54bb80201e6f5238
author Bill Yi <byi@google.com> 1563153864 -0700
committer android-build-merger <android-build-merger@google.com> 1563153864 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: a76086102b -s ours am: 03efc6a960 -s ours
am: a08b796130 -s ours
am skip reason: subject contains skip directive

Change-Id: I5b1eb9ba8e44eb45b09e1974bb66e0d500c6520c