tree 32b23b231d3ba0b6e999588ab9ee3f04e7d23242
parent bbfb7ac4bdc270431eb7892ebca1e00420297921
parent ebc321bdb215b876deea88b022b38978859b80af
author Bill Yi <byi@google.com> 1555049709 -0700
committer android-build-merger <android-build-merger@google.com> 1555049709 -0700

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

Change-Id: I3444044e42260385e0e207cba35cd6d610b36cfb