OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: 5ffabbe58b -s ours...
authorBill Yi <byi@google.com>
Tue, 18 Oct 2016 06:03:06 +0000 (06:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 18 Oct 2016 06:03:06 +0000 (06:03 +0000)
am: cda385e996  -s ours

Change-Id: I319f972f8593cf853ffe3feef4669d2765e3298a


Trivial merge