tree 79290d8597ad8df75b8622acee1cbccf43c1c878
parent 21967abbf7c9d1d48554d1306408941d9cc97bea
parent 9d9d31d6b0928b891e175cc14ed11cb76dc0497e
author Todd Kennedy <toddke@google.com> 1492644206 +0000
committer android-build-merger <android-build-merger@google.com> 1492644206 +0000

Merge "Adjust the bind timeout" into oc-dev
am: 9d9d31d6b0

Change-Id: I53b0afac3e8e8247a3bc2154a32f775dc707ef5c