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