OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 17:09:06 +0000 (17:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 17:09:06 +0000 (17:09 +0000)
am: 51e35963ae  -s ours

Change-Id: I54774e5f20216a738ba315f5fdaaac6e6f89c60a


Trivial merge