Merge "Import translations. DO NOT MERGE am: c300be1cf4 -s ours am: e7aa31539d -s ours" into nyc-mr2-dev-plus-aosp
am: 5a8f26382f -s ours
Change-Id: I709c97bb029ee6022795cfe1e53f8e8fdfe00832
This commit is contained in: