OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Tue, 11 Jul 2017 04:11:37 +0000 (04:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 11 Jul 2017 04:11:37 +0000 (04:11 +0000)
am: 75bcd075f2  -s ours

Change-Id: Ic3bdba9d8575e66c4e94229380e3225881244013


Trivial merge