tree beab4a8361a9900be78cb39a971e9a058d187134
parent 0d200f3d18419b9752919f0025d762dc7d73a0ae
parent 21fd2814309a0d16c7f240dd5f22a1373a2411a0
author Bill Yi <byi@google.com> 1565158004 -0700
committer android-build-merger <android-build-merger@google.com> 1565158004 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 6aa3f38983 -s ours
am: 21fd281430 -s ours
am skip reason: subject contains skip directive

Change-Id: I28610419a0520bf3d832f81edb50a23374e51dfb