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:37:41 +0000 (00:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 3 Aug 2017 00:37:41 +0000 (00:37 +0000)
am: 37f90d5767  -s ours

Change-Id: I575b7b2d41f1660de1628faf192e9031fd409a8a


Trivial merge