tree 4e181bf522b7be01533cd222cfe72366e9755d1d
parent 2fe1574e7ca2e3d7076e542658b07e355827703b
parent d230d40f3b0e701f0326cac8444c756008e2545b
author Bill Yi <byi@google.com> 1565380077 -0700
committer android-build-merger <android-build-merger@google.com> 1565380077 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: fe2d421fab -s ours am: 5c0d577dea -s ours
am: d230d40f3b -s ours
am skip reason: subject contains skip directive

Change-Id: I64750bfb717038391c71ec327a41e7869f0b0d15