OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Tue, 25 Oct 2016 06:24:23 +0000 (06:24 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Tue, 25 Oct 2016 06:24:23 +0000 (06:24 +0000)
commit45b00843489f4ef22269f1aef775bec3b65c2988
tree71d2341f44470976f3916c1cd53287650fa40acb
parent3f7cd6f73b9134b94145bf0a4cfeb3b66dc8c3e0
parent9421be201136a357b388019d787f54effa6a5415
Merge "Import translations. DO NOT MERGE" into nyc-mr1-dev
am: 9421be2011  -s ours

Change-Id: Id624f18f91ebf282cf8a5498f0c0b4c6682ea89e