tree 1da20333b5a4953cce5bd7dee77fbb60956def8f
parent db92d42d0eac2caed345da54977e08a547f3fc3e
parent fe94156266efdf0638d768c89e60352a1f61b60e
author Bill Yi <byi@google.com> 1459371850 +0000
committer android-build-merger <android-build-merger@google.com> 1459371850 +0000

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

* commit 'fe94156266efdf0638d768c89e60352a1f61b60e':
  Import translations. DO NOT MERGE

Change-Id: I5d0681a2ef5b828b00ac93ad4112535491e84156