OSDN Git Service

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

Change-Id: I43463ebcdccbd71229ee344a6af7b943a94d2dda


Trivial merge