OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 11 Oct 2017 20:09:44 +0000 (20:09 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:09:44 +0000 (20:09 +0000)
am: e721fbddb5  -s ours

Change-Id: Ic2a012410d13daece6049836eb20f1109011a4a6


Trivial merge