OSDN Git Service

Merge "Adjust the bind timeout" into oc-dev
authorTodd Kennedy <toddke@google.com>
Wed, 19 Apr 2017 23:23:26 +0000 (23:23 +0000)
committerandroid-build-merger <android-build-merger@google.com>
Wed, 19 Apr 2017 23:23:26 +0000 (23:23 +0000)
commita01fbf8ebbbd96da4e2c25506c5583fdf7c0c7c0
tree79290d8597ad8df75b8622acee1cbccf43c1c878
parent21967abbf7c9d1d48554d1306408941d9cc97bea
parent9d9d31d6b0928b891e175cc14ed11cb76dc0497e
Merge "Adjust the bind timeout" into oc-dev
am: 9d9d31d6b0

Change-Id: I53b0afac3e8e8247a3bc2154a32f775dc707ef5c