OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-mr1-dev
authorBill Yi <byi@google.com>
Wed, 30 Aug 2017 21:25:10 +0000 (21:25 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 30 Aug 2017 21:25:10 +0000 (21:25 +0000)
am: 9b9099ef3b  -s ours

Change-Id: Ia903a6127eee43bd4eac71869207da7634e22db7


Trivial merge