[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev

am: c38c7db007 -s ours
am skip reason: subject contains skip directive

Change-Id: I868539d4063dbd3b9d4e014871b5ef0fe42b0325
This commit is contained in:
Bill Yi 2019-10-12 11:29:48 -07:00 committed by android-build-merger
commit c993143422

Diff content is not available