OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01 -s ours am...
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 17:57:33 +0000 (17:57 +0000)
commitb7a560fb1009226bdc04d44cdd948862d1a532cc
tree21fae73df9b543a27b7c4a81e0008a11315a5487
parentf6c335b35343d7ba07deaf0e50d3915f4c081ffe
parentf1c75d66ec1b79bbf1c8c82df0abf7f3b8b47056
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours am: d21211470c  -s ours
am: f1c75d66ec  -s ours

Change-Id: Iaae57c91c09a4b1780c0c8e474700c56133b264e