tree 5e46eb197f768d83838afb7541ca9d1a01dda85f
parent 498f780f42d39906ef634abada86eb750ce24fbb
parent 237b52f40c5564a54a1073df6e77f6da93cdab12
author Bill Yi <byi@google.com> 1464973966 +0000
committer android-build-merger <android-build-merger@google.com> 1464973966 +0000

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

* commit '237b52f40c5564a54a1073df6e77f6da93cdab12':
  Import translations. DO NOT MERGE

Change-Id: I6155b21e15e89da4d6a5234a89b7dac3ac005099