[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 3a0a965cde -s ours
am skip reason: subject contains skip directive
Change-Id: Ia31264bebbd0ad2da96f7b84bd3b386302a885ca
This commit is contained in:
am: 3a0a965cde -s ours
am skip reason: subject contains skip directive
Change-Id: Ia31264bebbd0ad2da96f7b84bd3b386302a885ca