[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: f2799545f5 -s ours
am: 5ea19f4fb5 -s ours
Change-Id: I2b50dc3feb7c3803b66ad83a4f323c7b69572e0a
This commit is contained in: