tree f12ad3c7b58575844c792386a636283a1a0a476f
parent 120c3e9874c8b410def834037aec7d98c50d05d5
parent 9bc30ce545df10fe06de1d2d8d1555b82da5c129
author Bill Yi <byi@google.com> 1501107946 +0000
committer android-build-merger <android-build-merger@google.com> 1501107946 +0000

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
am: 9bc30ce545  -s ours

Change-Id: I8676942d8e77918837208d400a2e87a0b4e3d935