OSDN Git Service

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

* commit '337c1b110856328476341b405c31accacf6d48b2':

Change-Id: I826a96483a3120cb89337179c8438053992f7988


Trivial merge