OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Wed, 21 Jun 2017 20:19:33 +0000 (20:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 21 Jun 2017 20:19:33 +0000 (20:19 +0000)
am: d5a305068a  -s ours

Change-Id: Ieac3186dbb446b1d08ca96618a96b1c1493553c6


Trivial merge