OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: b094ba47a7 -s ours
authorBill Yi <byi@google.com>
Fri, 5 Aug 2016 18:32:05 +0000 (18:32 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 5 Aug 2016 18:32:05 +0000 (18:32 +0000)
am: acb237644c  -s ours

Change-Id: I5ab7471088651c3dd11c48abc495c73e826a1f5b


Trivial merge