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