Merge "Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 2e354740de -s ours" into nyc-mr1-dev-plus-aosp
am: 16dd875f8a -s ours
* commit '16dd875f8a7c29d5d8093b545b1c84c071067674':
Import translations. DO NOT MERGE
Change-Id: I0b7186cfc4c89ab730fd60e6ea41064a51d0968b
This commit is contained in: