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