Merge "[automerger skipped] Merge "Import translations. DO NOT MERGE" into qt-dev am: 41c7e07d12
-s ours am: 0bc3df3750
-s ours am: dc9a31d129
-s ours
am: a8b8b8a541
-s ours
am skip reason: subject contains skip directive
Change-Id: Ibb2e8e5af533e26893219e214f940f65ec994784
This commit is contained in:
commit
7704960b61