OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 6 Sep 2017 18:56:13 +0000 (18:56 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 18:56:13 +0000 (18:56 +0000)
commit25012afc7f81849227f04f69e397e0586ad597d0
treec0cececba93a048daa249e353ab60d9bc104efd5
parentf8f6cb368d3059ae95ce9b2d53f6f4d064e40f8c
parent14a359a550226037d64b8588faafe1840594cddc
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 14a359a550  -s ours

Change-Id: I3a7049ec212e3da3b673d3480ef3be5396762098