Merge "Import translations. DO NOT MERGE" into stage-aosp-master
am: 2b8d4b588a -s ours
Change-Id: If78dc2dea18addf87ecec09118d0a1284c265fd5
This commit is contained in:
am: 2b8d4b588a -s ours
Change-Id: If78dc2dea18addf87ecec09118d0a1284c265fd5