OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 3 Mar 2018 13:18:11 +0000 (13:18 +0000)
am: 5b67a302d4  -s ours

Change-Id: Ieab93fb1ab78ad5633e328eee9c59616239ea487


Trivial merge