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