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

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

Change-Id: I82d7a41da78f4ee69f786cfa7a7681ea21438af1
This commit is contained in:
Bill Yi 2019-10-12 12:48:01 -07:00 committed by android-build-merger
commit 7c609c0cc4

Diff content is not available