OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 26 Jan 2018 21:13:17 +0000 (21:13 +0000)
commitda312d3a444347f8226810039faea1f1ac099fcf
tree6eabf8ba0608a0a5669a02e2b9e8fac368cba203
parent6ab6643d3e63496c84063a0cf6ec4e0a5daacfb4
parenta2c154e0cd226e07a121ba54204bd8a3faabfda5
Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
am: a2c154e0cd  -s ours

Change-Id: Ic092382ce5846801335c5d23aa105bb372a044e4