OSDN Git Service

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

Change-Id: I41ff5e62cefb7fa5d63f36d463e974af90b434ef


Trivial merge