OSDN Git Service

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

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

Change-Id: I72a678ae2aa88ee246fbc5ed276fdcd3d52eaa33


Trivial merge