tree 9ae2ea51d65b5e3e1f563727df1b69c970f95c7f
parent e8cf08da113c99ddc0dd06ed903c586218024b88
parent 29f7837cf023414070d8a68034d99b9badb18fac
author Bill Yi <byi@google.com> 1459012990 +0000
committer android-build-merger <android-build-merger@google.com> 1459012990 +0000

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

* commit '29f7837cf023414070d8a68034d99b9badb18fac':
  Import translations. DO NOT MERGE