tree f9612031be23c2be4a4b92817f37d6d3050dbcbf
parent 03e3ea94869eb533eaa7fbc0ec705c5de2980d21
parent b5b893485e793b2558db035b0f2ba35d454be7f6
author Bill Yi <byi@google.com> 1559451093 -0700
committer android-build-merger <android-build-merger@google.com> 1559451093 -0700

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

Change-Id: I6582042ffcb84d3f9fb1f419c40483217d6d1075