Merge "Import translations. DO NOT MERGE am: b004945727 -s ours am: f1a5ffbf99 -s ours" into nyc-mr2-dev-plus-aosp
am: 314938f9bd -s ours
Change-Id: If04db51de38abc16a4f6813cc79409c44ae7d8a9
This commit is contained in: