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