OSDN Git Service

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

Change-Id: I18f9aec026325e0ee42f9a8b228a6f235a9050b3


Trivial merge