[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 9470271d85 -s ours
am: cbb9ab8ad3 -s ours
Change-Id: I41fb8019799db51d33c1aca7267f719801550647
This commit is contained in: