OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: b39c08f9d7 -s ours
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 15:30:52 +0000 (15:30 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 15:30:52 +0000 (15:30 +0000)
am: 3cd12a1ca7  -s ours

Change-Id: Ibf672901baeae0668e40f04c37b2ab56801b5864


Trivial merge