[automerger skipped] Merge "Import translations. DO NOT MERGE" into pi-dev am: 624bac2cd8
-s ours
am: 6c7f0252df
-s ours
am skip reason: subject contains skip directive
Change-Id: I3d180cc20756e2d1cdb84962091917c6e41c759c
main
commit
8acd3cfea6