| commit | f48c50e61a7013168095989c6889c1ddbccf30e3 | [log] [tgz] |
|---|---|---|
| author | Richard Frankel <rofrankel@google.com> | Fri Jan 27 19:42:34 2017 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Fri Jan 27 19:42:34 2017 +0000 |
| tree | 32ef6af871edae1d5e52d4e655916e275c462ef1 | |
| parent | 6bad544d30b7867db73a5c6fefdab71558e38bb7 [diff] | |
| parent | feaa31ab2c875cbe1c359b8115da41b713766041 [diff] |
Merge "conman: Time out connection checks after 5s."