tree 32ef6af871edae1d5e52d4e655916e275c462ef1
parent 6bad544d30b7867db73a5c6fefdab71558e38bb7
parent feaa31ab2c875cbe1c359b8115da41b713766041
author Richard Frankel <rofrankel@google.com> 1485546154 +0000
committer Gerrit Code Review <noreply-gerritcodereview@google.com> 1485546154 +0000

Merge "conman: Time out connection checks after 5s."