OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 16 Sep 2017 20:08:25 +0000 (20:08 +0000)
am: fa04d2e02a  -s ours

Change-Id: Ifbf67ba7f1c928c2231ef56615a3e4a043fd93d2


Trivial merge