[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 41b4f606be -s ours am: ab59418095 -s ours
am: a5e847adaa -s ours
am skip reason: subject contains skip directive
Change-Id: I05ffc6992845b466926d1e9038e7ff0a2e952a0e
This commit is contained in: