OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 12:54:26 +0000 (12:54 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 12:54:26 +0000 (12:54 +0000)
am: 90edb46  -s ours

* commit '90edb46d017f793401f65c64368a7a4cf6f881f9':
  Import translations. DO NOT MERGE

Change-Id: I117fb5328c018acba51075910c78af1ac4fa9035


Trivial merge