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