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