OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: e3c1d48dc0 -s ours
authorBill Yi <byi@google.com>
Fri, 14 Oct 2016 09:22:22 +0000 (09:22 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 14 Oct 2016 09:22:22 +0000 (09:22 +0000)
am: fca9f14523  -s ours

Change-Id: I93d33092855c51ea31bd376ea49e3a312bb88eac


Trivial merge