OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: a53f8a9128 -s ours
authorBill Yi <byi@google.com>
Thu, 30 Mar 2017 02:01:15 +0000 (02:01 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 30 Mar 2017 02:01:15 +0000 (02:01 +0000)
am: 92547f4b39  -s ours

Change-Id: Ib98981df6ecefe159ea9b394e29ed8c94d19475c


Trivial merge