OSDN Git Service

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

Change-Id: I6559d4e1d46cd96e4c40a01c789b58cc41069b88


Trivial merge