OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Fri, 21 Apr 2017 08:03:35 +0000 (08:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 21 Apr 2017 08:03:35 +0000 (08:03 +0000)
commit5a081a225f81af6389a81a8b01205970a505ac92
tree04fc4f76d6bbb1ad9bfe770e9f256f8765aba2f5
parent838d7957312f9bf524cf5a78f343172f369b3786
parent4b76d33968511c2dd56b25940115dcc823afedc8
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4b76d33968  -s ours

Change-Id: Idf537deb9593253c352a3dbcbb4a18ecfdc1e487