[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-qpr1-dev am: 914bda7715
-s ours
am: 23269a9dce
-s ours
am skip reason: subject contains skip directive
Change-Id: Iebe020f2fea82262686de76856e5cc9d670e5454
This commit is contained in: