[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev
am: 41751064bc -s ours
am skip reason: subject contains skip directive

Change-Id: I6b99f1b3bc208d28ff1c7476b120132da592c95c