OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Thu, 24 Aug 2017 16:11:23 +0000 (16:11 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 24 Aug 2017 16:11:23 +0000 (16:11 +0000)
am: 7175b7b929  -s ours

Change-Id: I45956469aa428467ffb7039288cd99a177566083


Trivial merge