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