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