OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: a0376f250f -s ours
authorBill Yi <byi@google.com>
Tue, 27 Jun 2017 20:14:06 +0000 (20:14 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 27 Jun 2017 20:14:06 +0000 (20:14 +0000)
am: fb1469df92  -s ours

Change-Id: Ifb022132551c672231f4077e68d41b65ac6a2c2f


Trivial merge