[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12
-s ours am: 0bc3df3750
-s ours am: f3e110b97e
-s ours
am: bfdaa8cea8
-s ours
am skip reason: subject contains skip directive
Change-Id: I7e9d72a39ee43926a07ba116601735da09a9a225
This commit is contained in:
commit
abdc401375