[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 8c9c8a6939 -s ours
am: 0dd46f1e35 -s ours
am skip reason: subject contains skip directive
Change-Id: I141528db38fb9376c27152c39987bee3f545f0b0
This commit is contained in: