[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: cd986c2c38 -s ours
am: 11c27313e6 -s ours
Change-Id: I9655a38f71906d39ac0b7a05b74f46f87ad8aae1
This commit is contained in: