OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Fri, 23 Jun 2017 13:00:07 +0000 (13:00 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 23 Jun 2017 13:00:07 +0000 (13:00 +0000)
am: 6300674d27  -s ours

Change-Id: I242fc96c03e5e4754cbc3fee027ce483301f0b1c


Trivial merge