[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 3a0a965cde -s ours
am: 35b6920665 -s ours
am skip reason: subject contains skip directive
Change-Id: I346b8cb68ed8d42128e0f1cf8f401aade3449b4c
This commit is contained in: