OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 13 Sep 2017 22:47:26 +0000 (22:47 +0000)
commit4f8b486f6938969d383965f0aea5c1206ac8b193
treebf19400e6e3b87f7ded336a2e31f87edea54ebd1
parentc0ccea9bf582ba200e9d2a239ff6bd03587c07e1
parent37f29b0359c511c913c4d2435abe5f95947c657a
Merge "Import translations. DO NOT MERGE" into cw-f-dev
am: 37f29b0359  -s ours

Change-Id: I8a446d3a47db4c97e7292a8b6322a12013807813