OSDN Git Service

Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c -s ours am: 82359...
authorBill Yi <byi@google.com>
Mon, 25 Apr 2016 15:37:34 +0000 (15:37 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Mon, 25 Apr 2016 15:37:34 +0000 (15:37 +0000)
commit45e81980604e49b64d73b33e9f8653a4f3f93d8a
tree45112cd50c1e6f3b0b2d817725e9de3a049a7a32
parent2e12c12e17a609679066d031993293871396d410
parent2f51b88d6692882892aa42eee3def51b0382c82f
Merge "Import translations. DO NOT MERGE" into nyc-dev am: b6a186c  -s ours am: 8235995  -s ours
am: 2f51b88  -s ours

* commit '2f51b88d6692882892aa42eee3def51b0382c82f':

Change-Id: I69e825dc3f86dd6cf833f7a2f343558e5b5d6092