OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dr1-dev
authorBill Yi <byi@google.com>
Sat, 10 Jun 2017 15:21:17 +0000 (15:21 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Sat, 10 Jun 2017 15:21:17 +0000 (15:21 +0000)
am: 70a2b34938  -s ours

Change-Id: Ica458f82fe18edb4f2b74b11aded21b66f1096d3


Trivial merge