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