[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 5d25caa87a -s ours am: 823142f20a -s ours
am: 1f9cf05483 -s ours
am skip reason: subject contains skip directive
Change-Id: I109fb7d85849ee3e93b42c958261656fb0ee4f07
This commit is contained in: