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