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