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