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