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