OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186 -s ours
authorBill Yi <byi@google.com>
Wed, 26 Jul 2017 08:14:11 +0000 (08:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Jul 2017 08:14:11 +0000 (08:14 +0000)
commitb4b0c6acb44d506717f210dad8b30100694c10d7
tree096424997f422b24a2175f5cc25ab14e56a498d1
parentaf65d78745f610ea68cc20c4fbf9e44fa75800e8
parent5bbc5fe52165cb897836b508a1929b4a7492a2b0
Merge "Import translations. DO NOT MERGE" into oc-dev am: b4e8cad186  -s ours
am: 5bbc5fe521  -s ours

Change-Id: I43cb6a9c7ea06c02575a53816cd649c6e0a4c2c2