[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-r1-dev am: 7892f729a5 -s ours
am: 978cd2b768 -s ours
am skip reason: subject contains skip directive
Change-Id: I0acc5b0bd1a1f29bb5acbfd6d17d3da7f4f84dcf
This commit is contained in: