OSDN Git Service

Merge "Import translations. DO NOT MERGE" into cw-f-dev
authorBill Yi <byi@google.com>
Thu, 20 Oct 2016 16:03:54 +0000 (16:03 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Oct 2016 16:03:54 +0000 (16:03 +0000)
am: 0f62ca3a57  -s ours

Change-Id: Ic7f85082337cee707f4166508ae49986471a925f


Trivial merge