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