OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Thu, 26 Jan 2017 07:14:41 +0000 (07:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 26 Jan 2017 07:14:41 +0000 (07:14 +0000)
am: 6201ee5c68  -s ours

Change-Id: I02412d6d4a77f847f3eef6e822664cc10dd6768e


Trivial merge