OSDN Git Service

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

Change-Id: Ifd66f13f6b1384eae3f3697b7ac275c442386e0c


Trivial merge