[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: fb389b2724 -s ours am: 75141af0c2 -s ours am: 915c3e2bd7 -s ours am: fbf5747a8f -s ours
am skip reason: subject contains skip directive Change-Id: I2b9212bcb8e8a8128b56ae87be78bfb3c87411e9
This commit is contained in: