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