[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 569d391c8a -s ours am: 43b5b509ab -s ours
am skip reason: subject contains skip directive Change-Id: Iff9d25a695775b64bfeea65d2deed105d32eec00
This commit is contained in: