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