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