OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 1 Jul 2017 16:56:31 +0000 (16:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 1 Jul 2017 16:56:31 +0000 (16:56 +0000)
am: 6eb3418ea7  -s ours

Change-Id: Iaabcd416d7c51bec1b821c709932fa758d9bc987


Trivial merge