[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: ccb540ceda
-s ours
am: 70755c9a4a
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibb67fd39268243f36632997d9ce45a97089861b1
This commit is contained in:
commit
21bffeea88