OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Thu, 28 Sep 2017 19:33:32 +0000 (19:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 28 Sep 2017 19:33:32 +0000 (19:33 +0000)
am: d5b9fec389  -s ours

Change-Id: Iec1b837215cf09e1904287f9eee0082fa4f00097


Trivial merge