tree 537091d56f93586a4d906aa6f5f3922eb1cba2d2
parent 442628a22693286cc1f96e1b1fbd8743f9eedea7
parent aa56eef3fd67e8eb20df96850e0175fb15b3f415
author Bill Yi <byi@google.com> 1464712606 +0000
committer android-build-merger <android-build-merger@google.com> 1464712606 +0000

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

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

Change-Id: I8d141f7bb06750c09b60084105ec51f6aeb244ad