OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev am: 0ffe43ecd7 -s ours
authorBill Yi <byi@google.com>
Tue, 10 Jan 2017 07:29:29 +0000 (07:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 10 Jan 2017 07:29:29 +0000 (07:29 +0000)
am: 856bfc2019  -s ours

Change-Id: Id6431aeb418700ed20636fe6f369195d1501efb7


Trivial merge