[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: a9761dd09f
-s ours
am: ed4461afd4
-s ours
am skip reason: subject contains skip directive
Change-Id: I6a1d8965ea9f181c7b014dead2472ca07548acbd
This commit is contained in:
commit
1faa823150