[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev
am: 8d5ac64187
-s ours
am skip reason: subject contains skip directive
Change-Id: I401482cc39014a17de76717dd54065f703ac4a07
This commit is contained in:
commit
3e5c5b08bb