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