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