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