OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: e1f66b297d -s ours
authorBill Yi <byi@google.com>
Thu, 3 Aug 2017 00:40:35 +0000 (00:40 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:40:35 +0000 (00:40 +0000)
am: 7eed96cc1c  -s ours

Change-Id: I1fe5f42babe19bd8d4b90d3bfff2877cf06a7fbe


Trivial merge