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