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