OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Sun, 30 Apr 2017 16:14:26 +0000 (16:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sun, 30 Apr 2017 16:14:26 +0000 (16:14 +0000)
am: b212441814  -s ours

Change-Id: Ia7f4b06b6f60dcb432d7303f918753ffb5f2c81c


Trivial merge