OSDN Git Service

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

Change-Id: I427a4ab63aca8bac7ff2c4a251052becf018b7d8


Trivial merge