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