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