OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 86817456ff -s ours
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:33:02 +0000 (16:33 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:33:02 +0000 (16:33 +0000)
am: 4d681e127b  -s ours

Change-Id: Ibf37f62606eb31b3dadde411d91a501203a79b3f


Trivial merge