OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:35:55 +0000 (13:35 +0000)
am: 242c3c497c  -s ours

Change-Id: Idbb294776a7400de5aebb99b9a45f7121c7415f6


Trivial merge