[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 3da184f074 -s ours
am: 32cab7934a -s ours
Change-Id: I206135578fa351bb610f15ecb08705908cb8fd6f
This commit is contained in: