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