OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 7 Jul 2017 15:55:58 +0000 (15:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 7 Jul 2017 15:55:58 +0000 (15:55 +0000)
am: 9da0a744c5  -s ours

Change-Id: Ic856cb8ca560d42fae8f1b6499716300f39218c8


Trivial merge