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