[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 47b32d0939 -s ours
am: 91eefed117 -s ours
am skip reason: subject contains skip directive
Change-Id: I33333a8a340c5de44e9f2554b136b6d19a92450b
This commit is contained in: