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