[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 8b9c85f0cd -s ours
am: 957463ca00 -s ours
am skip reason: subject contains skip directive
Change-Id: I8669d27559f0586d0d8401f6395e900a1a98f92d
This commit is contained in: