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 19:25:25 +0000 (19:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 21 Dec 2017 19:25:25 +0000 (19:25 +0000)
commit5af20c1c283ac4f942a09881c284da5e810793c0
treebb220531b379d75f755bf4ab287267e06a610e04
parentf24783846de005ea70dcc0264dcd06f3c268b8f2
parentb7a560fb1009226bdc04d44cdd948862d1a532cc
Merge "Import translations. DO NOT MERGE" into cw-f-dev am: 599fb37c01  -s ours am: d21211470c  -s ours am: f1c75d66ec  -s ours
am: b7a560fb10  -s ours

Change-Id: I612fa092984c77c735a27c0da5998890c518ffd4