tree 3805631875ae0d92c9c5de6d37c02885f17d7158
parent 2f0019f9b6aebf9e61f579ec34595e45180947ce
parent 5f6a4222815abe478045d81d71f65c75ff2cbbbd
author Bill Yi <byi@google.com> 1457720018 +0000
committer android-build-merger <android-build-merger@google.com> 1457720018 +0000

Merge "Import translations. DO NOT MERGE" into nyc-dev
am: 5f6a422281  -s ours

* commit '5f6a4222815abe478045d81d71f65c75ff2cbbbd':
  Import translations. DO NOT MERGE