OSDN Git Service

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

Change-Id: I51b7f30fb9f32d74eb4a5df4fa0b84da834510c1


Trivial merge