OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 3 Jun 2016 17:23:32 +0000 (17:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 3 Jun 2016 17:23:32 +0000 (17:23 +0000)
am: d8a450557e  -s ours

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

Change-Id: I56f1f226de2d4631b76c5b343d27e3e8b76c4a11


Trivial merge