OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev am: e721fbddb5 -s ours am...
authorBill Yi <byi@google.com>
Wed, 11 Oct 2017 20:29:08 +0000 (20:29 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 11 Oct 2017 20:29:08 +0000 (20:29 +0000)
am: 311fa22ecb  -s ours

Change-Id: Ib222f7ef5dd91dba7814a9c10501c0f8b36cd2d0


Trivial merge