[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: abff0ad0e3
-s ours
am: 7c609c0cc4
-s ours
am skip reason: subject contains skip directive
Change-Id: I836b594b3870dfdac403f7b7194e0af5045f2d30
This commit is contained in:
commit
fb2d095a03