OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr2-dev
authorBill Yi <byi@google.com>
Sat, 5 Nov 2016 06:34:16 +0000 (06:34 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 5 Nov 2016 06:34:16 +0000 (06:34 +0000)
am: 1b93d5c5a1  -s ours

Change-Id: I060e73ebf28424676c37b46a489766d94b79800e


Trivial merge