OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Sep 2017 17:53:43 +0000 (17:53 +0000)
commitd516ba6a80c1c949fe68e9136b0692c770ca3d75
tree4fc40676953651970e2e37c304ca4dd035d1658d
parentb0f3f6ce0509870ce40168ce4bd422942bc6b47f
parent17acd3d1c82faec84fefda79cd4b337880ce1236
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: 17acd3d1c8  -s ours

Change-Id: I1813ac496b209342c8326a8107b2597691f16da1