tree 0898532177dd9fb108655a05af38d73a5ccab39e
parent c10e3ab60a39561d20de1543b49ceb2106cc7a70
parent 018e4cab7e1673d14307ef29f2e5ba6935792b94
author Bill Yi <byi@google.com> 1564089142 -0700
committer android-build-merger <android-build-merger@google.com> 1564089142 -0700

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

Change-Id: I504073395d6038c42eb8ee65fa3231366252ce02