tree 133a3f5a995b97baae82b69923f58467826eb227
parent 67232a88c2642f0dc39a167beb26f208dda79b07
parent 949a22d7548a04ec5ec23d4f0103610a4197240e
author Bill Yi <byi@google.com> 1561665188 -0700
committer android-build-merger <android-build-merger@google.com> 1561665188 -0700

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

Change-Id: I7fb9404482659f6428c8a0e5f2ebd80498e1147f