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