OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:05:31 +0000 (17:05 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:05:31 +0000 (17:05 +0000)
am: 33192787ce  -s ours

Change-Id: I2b5f30a86e62d6f8158da6d359dc27615f719e3d


Trivial merge