OSDN Git Service

Merge "Merge "Import translations. DO NOT MERGE" into oc-dev am: 327b9119d7 -s ours...
authorBill Yi <byi@google.com>
Tue, 13 Jun 2017 08:19:20 +0000 (08:19 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 13 Jun 2017 08:19:20 +0000 (08:19 +0000)
am: 8315525c76  -s ours

Change-Id: Ib1cb17bc34c42d8510a6ae862f37da8496c7d175


Trivial merge