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

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

Change-Id: I2e5538041b7746240da20c7c740f242a4869cc80
This commit is contained in:
Bill Yi 2019-04-17 15:43:52 -07:00 committed by android-build-merger
commit 67f5074f2b

Diff content is not available