OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 19:56:07 +0000 (19:56 +0000)
am: 242c3c497c  -s ours

Change-Id: Iaa7d2555bdcab5be052515f8f5d9c5c38360b4e9


Trivial merge