OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev
authorBill Yi <byi@google.com>
Wed, 27 Apr 2016 20:15:35 +0000 (20:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 27 Apr 2016 20:15:35 +0000 (20:15 +0000)
am: 58a1a07  -s ours

* commit '58a1a07470456290b0b5e25ddeb07a6247962b88':
  Import translations. DO NOT MERGE

Change-Id: If35a4943aec1855b44250d495a034c1b73b4ea49


Trivial merge