tree 2f683b303b48022502f9ef6d49396b55f2264ba8
parent e55d263d7ad3259474754fd4ab6aa44fc71c51d1
parent 2e032b7463bef48b88cd18f2c5b8501a0d80b9ce
author Bill Yi <byi@google.com> 1464978764 +0000
committer android-build-merger <android-build-merger@google.com> 1464978764 +0000

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

* commit '2e032b7463bef48b88cd18f2c5b8501a0d80b9ce':
  Import translations. DO NOT MERGE

Change-Id: Ia90dbc3d86b317621b525665a9817cd41b8d497f