[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 4492996f04
-s ours am: c3211cb040
-s ours
am: 021da087d7
-s ours
am skip reason: subject contains skip directive
Change-Id: Id282b1fe958ba5d60a90d871da229ef830b30337
This commit is contained in:
commit
98bdd8379b