am 625ae1d0: am 11c13abd: Merge "Use time() instead of clock() for timeouts."

* commit '625ae1d0023f21a3a353c41322d47dd2e0af55c0':
  Use time() instead of clock() for timeouts.
This commit is contained in:
Christopher Ferris 2014-09-09 22:59:50 +00:00 committed by Android Git Automerger
commit 05579f004e

Diff Content Not Available