OSDN Git Service

Merge "Use time() instead of clock() for timeouts."
authorChristopher Ferris <cferris@google.com>
Tue, 9 Sep 2014 22:39:44 +0000 (22:39 +0000)
committerGerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 9 Sep 2014 22:39:44 +0000 (22:39 +0000)

Trivial merge