OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Mon, 30 Oct 2017 07:01:17 +0000 (07:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 30 Oct 2017 07:01:17 +0000 (07:01 +0000)
am: 68b49a3a8e  -s ours

Change-Id: I1249381abcb2c1610a8671af6993121c24280234


Trivial merge