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