OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dr1-dev am: 3f9462d6a3 ...
authorBill Yi <byi@google.com>
Thu, 20 Jul 2017 10:21:32 +0000 (10:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Thu, 20 Jul 2017 10:21:32 +0000 (10:21 +0000)
am: 1866df21f9  -s ours

Change-Id: Iafd3408ca1a7fd716ac22f7d7b2a33e053bc6b5c


Trivial merge