tree 7e7f9b297080deeca6b5ee66d2924e31fbe84e05
parent e0abaf2a1198c662e1ca352e3576011efaa35216
parent bd03235b7d58b173be7f08b328d8e8d1896f87ae
author Bill Yi <byi@google.com> 1566113633 -0700
committer android-build-merger <android-build-merger@google.com> 1566113633 -0700

[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4769e819e9 -s ours am: b532faa7c9 -s ours
am: bd03235b7d -s ours
am skip reason: subject contains skip directive

Change-Id: I49d283429f3c7e813d1cd4833621be9f4e82d629