OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sat, 3 Jun 2017 21:41:24 +0000 (21:41 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Jun 2017 21:41:24 +0000 (21:41 +0000)
am: f31a663316  -s ours

Change-Id: I349a8b805ab94428e62bcc5080771a1b675e0bcc


Trivial merge