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)

Trivial merge