OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 21:17:15 +0000 (21:17 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 21:17:15 +0000 (21:17 +0000)
commitf49bf087ba7ae24ca12a16dc0159c285efb1623a
treef20d0919b8ac0d93284e2f3d5ab4e14df7ff4e09
parent5d7c823e168aea960fab6e140e9bd0c2dd7cdbc5
parentc0745b94c24d8e4325b35070d3b6accdb8833190
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: c0745b94c2  -s ours

Change-Id: Ia1425c1a21585764700000bf98fb25d3346bd639