[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 14e8d19136
-s ours
am: 29cd55ff3f
-s ours
am skip reason: subject contains skip directive
Change-Id: If9293310e45a19f638b7be59f8083385939dbfe9
This commit is contained in:
commit
3eb2f44036