OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 22 Jul 2017 16:27:36 +0000 (16:27 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 22 Jul 2017 16:27:36 +0000 (16:27 +0000)
am: 86817456ff  -s ours

Change-Id: I10c9bfb5e9e22e565b29a1a6b6eda86c8c08f31e


Trivial merge