OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea -s ours
authorBill Yi <byi@google.com>
Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 17:42:12 +0000 (17:42 +0000)
commit2c97ca3b626bb14ee3ba9fc67ac6b413ca436a5b
tree9f918957a528605a37defb5293e029784c60a20a
parent0bfcd7eef7f78247e32a55c8da690f914628d10f
parent5943ef281a5b190d9845cdfcfda29dcbba9f7de7
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 1f204cd1ea  -s ours
am: 5943ef281a  -s ours

Change-Id: I9758d713fb9328b7f2218dae49e334f16a703476