[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: b1aad16b4a -s ours
am: 20cf07b649 -s ours
am skip reason: subject contains skip directive
Change-Id: I86600556a88f70a4094dc08ee730d852ee8ced21
This commit is contained in: