OSDN Git Service

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

Change-Id: Ibbdb7922b216c0c3ffeeccd1b2a02a8a8841ac47


Trivial merge