[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: I040b4ee562c1bd55d918b304e3e7a33c3b02d038
This commit is contained in: