OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 10 Jun 2017 06:05:23 +0000 (06:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 06:05:23 +0000 (06:05 +0000)
am: 62bee2f5ff  -s ours

Change-Id: I2c72358b3b45a3321d76d9af147d3f3c0b179846


Trivial merge