OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Mon, 12 Jun 2017 21:21:12 +0000 (21:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 12 Jun 2017 21:21:12 +0000 (21:21 +0000)
am: 7c2a12b658  -s ours

Change-Id: I4170e095966f1d8752e2b020777b5719a779b376


Trivial merge