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