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