OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Fri, 19 Aug 2016 15:35:12 +0000 (15:35 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 19 Aug 2016 15:35:12 +0000 (15:35 +0000)
am: 4122130005  -s ours

Change-Id: I2688851beb78619270d8cb6dc077992b9cec037d


Trivial merge