OSDN Git Service

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

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

Change-Id: I61695109d9a89b5e4ab572afc17d773daee9f6d4


Trivial merge