OSDN Git Service

Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
authorBill Yi <byi@google.com>
Fri, 22 Jul 2016 02:13:25 +0000 (02:13 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Fri, 22 Jul 2016 02:13:25 +0000 (02:13 +0000)
commitce600b4e128db76fd33721c68ba4ae1137550403
tree47ba8a0c0e258adb46b94b1b6544dd274d89ffb5
parentbf5e412fd17d715f08669b83a838386109c82a5d
parentd6498d112000dc4fe33be5928dc877d55fc98f7f
Merge \"Import translations. DO NOT MERGE\" into nyc-mr1-dev
am: d6498d1120  -s ours

Change-Id: I40a278fefe8891467e6b7e3f01a1f18514b85fb0