OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev am: d84995e18f -s ours
authorBill Yi <byi@google.com>
Thu, 1 Sep 2016 06:51:32 +0000 (06:51 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 1 Sep 2016 06:51:32 +0000 (06:51 +0000)
am: 782e55f75c  -s ours

Change-Id: I4d08dad81f04f32211a4d29df13bcaba8c63a4f8


Trivial merge