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