OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:29:36 +0000 (20:29 +0000)
am: adbd504f40  -s ours

Change-Id: Ib897fe4ba9ab7bffb8b6c88054cbe588068c13d1


Trivial merge