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)
commit663f6ba460e30f7e4929130ace2b88c3ce7243f3
tree81b287c7b3615e4de0c0470a069a530a8d42d0ba
parentf292f23c0ce7c8f5faa108cdac1ddc84fa7c1cec
parent4bce1569a138d74fcb5ba67eb1335e8862bf3d52
Merge "Import translations. DO NOT MERGE" into oc-dev
am: 4bce1569a1  -s ours

Change-Id: I45def8ddf5947cbc924809e147e0b4cdce98e172