Merge "Import translations. DO NOT MERGE" into mnc-dr1.5-dev
am: 48c2433379
-s ours
Change-Id: Iae34502cdbd6e50e6c40202bd84a45fb01edc826
main
commit
3817d6924c
am: 48c2433379
-s ours
Change-Id: Iae34502cdbd6e50e6c40202bd84a45fb01edc826
main