OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: 75b5199e9d -s ours
authorBill Yi <byi@google.com>
Thu, 8 Jun 2017 22:52:21 +0000 (22:52 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 8 Jun 2017 22:52:21 +0000 (22:52 +0000)
am: 5679e1cc6e  -s ours

Change-Id: I62d5eaf20549840c1a4adab9f247b292e3505159


Trivial merge