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