| commit | 85e6e87c41bba51729cee8958a5c30157c8dc674 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu May 22 01:45:47 2014 +0000 |
| committer | Gerrit Code Review <noreply-gerritcodereview@google.com> | Thu May 22 01:45:47 2014 +0000 |
| tree | c2a1d2f6aaf08d90b1efda93c66899b4f5add6af | |
| parent | 3b6da6bfb50a1c0324fb4c87326d3a477944d5fe [diff] | |
| parent | 22f22ffcb111b38eb7a303bfde39aed108b43e07 [diff] |
Merge "Restore accidentally-removed NULL timeout."