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