[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 2407b65709 -s ours
am: 5540373d4f -s ours
am skip reason: subject contains skip directive
Change-Id: If1b222dbfc8f93199a1fe15e42e5ac6673224ab2
This commit is contained in: