OSDN Git Service

Merge "Import translations. DO NOT MERGE" into oc-dev
authorBill Yi <byi@google.com>
Wed, 26 Apr 2017 19:55:12 +0000 (19:55 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 26 Apr 2017 19:55:12 +0000 (19:55 +0000)
am: 4bce1569a1  -s ours

Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172


Trivial merge