OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a -s ours
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 02:38:30 +0000 (02:38 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 02:38:30 +0000 (02:38 +0000)
commit2d8c070c500779dcc3428869b40b72ce8e04958b
tree9a8f65cf0e21300e1dd6018fbf97dc520010dcb6
parent47bb41b1bb3c8a31598d9ba1ec40b4bbb304ef3f
parent15094560a484e3d112e5c0c759a20d8d57d976c4
Merge "Import translations. DO NOT MERGE" into oc-dev am: 7fc501184a  -s ours
am: 15094560a4  -s ours

Change-Id: I515e92a539513b308fc79ae7127d074819bc3a73