OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 8 Jun 2017 23:15:04 +0000 (23:15 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 23:15:04 +0000 (23:15 +0000)
am: dd5886bc5b  -s ours

Change-Id: I62a7f882d68c02075e41e2c9da475a75af113b0f


Trivial merge