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

* commit '11c13abd56693d4a4be3ca9e14cbaa456ba586b9':
  Use time() instead of clock() for timeouts.
This commit is contained in:
Christopher Ferris 2014-09-09 22:54:12 +00:00 committed by Android Git Automerger
commit 625ae1d002

Diff Content Not Available