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