OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7c23c990f1 -s ours
authorBill Yi <byi@google.com>
Thu, 22 Jun 2017 13:50:02 +0000 (13:50 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 22 Jun 2017 13:50:02 +0000 (13:50 +0000)
am: 1a588ec465  -s ours

Change-Id: Id6ea25f828e01b7e8aaf0b186718f830d111c797


Trivial merge