OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-mr1-dev am: 018d1e066e ...
authorBill Yi <byi@google.com>
Wed, 6 Sep 2017 22:28:43 +0000 (22:28 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 6 Sep 2017 22:28:43 +0000 (22:28 +0000)
am: b641261c97  -s ours

Change-Id: I0f739bb83d767065760ef5e631503a0e9c9ff39b


Trivial merge