[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev
am: 32bb8f9993
-s ours
am skip reason: subject contains skip directive
Change-Id: Ifd17be5a20f5a1c9787d3f082238c7326ad9b88c
This commit is contained in:
commit
0159a56eb0