OSDN Git Service

Merge "Restore accidentally-removed NULL timeout."
authorElliott Hughes <enh@google.com>
Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Thu, 22 May 2014 01:45:47 +0000 (01:45 +0000)
commit85e6e87c41bba51729cee8958a5c30157c8dc674
treec2a1d2f6aaf08d90b1efda93c66899b4f5add6af
parent3b6da6bfb50a1c0324fb4c87326d3a477944d5fe
parent22f22ffcb111b38eb7a303bfde39aed108b43e07
Merge "Restore accidentally-removed NULL timeout."