OSDN Git Service

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

Change-Id: Id76b78032b01aed87ff6b203d44c09324aefea62


Trivial merge