[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: f9d3758a02 -s ours am: 9280c124ed -s ours am: 7ccb1705c0 -s ours
am skip reason: subject contains skip directive Change-Id: I1ec77bdc001d50ccd6cc3d2afb4db9553dfbfb7a
This commit is contained in: