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