tree 070d1fbf85b1652fdedb7ad8c516f4993e9c4f65
parent 8e88028ab5f1d3196ca4588d21b4d2d709de05b1
parent a21c0de9ae06832723c344e7a3a6fd14fe59d088
author Bill Yi <byi@google.com> 1561943233 -0700
committer android-build-merger <android-build-merger@google.com> 1561943233 -0700

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

Change-Id: If246a993fb82ac1ce4ce75161396b79326acef76