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