[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 7ca1d7b278 -s ours
am: 2a5ccbbe9d -s ours
am skip reason: subject contains skip directive
Change-Id: I5c499c5aacc835308904952646f0cd056ad2413d
This commit is contained in: