OSDN Git Service

am 11c13abd: Merge "Use time() instead of clock() for timeouts."
authorChristopher Ferris <cferris@google.com>
Tue, 9 Sep 2014 22:54:12 +0000 (22:54 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Sep 2014 22:54:12 +0000 (22:54 +0000)
commit625ae1d0023f21a3a353c41322d47dd2e0af55c0
tree8fdd0e0689f5dbd89b0be210734aff7ba518cee2
parent500c086a7e93dd485dc98bae5ab8430bc165c301
parent11c13abd56693d4a4be3ca9e14cbaa456ba586b9
am 11c13abd: Merge "Use time() instead of clock() for timeouts."

* commit '11c13abd56693d4a4be3ca9e14cbaa456ba586b9':
  Use time() instead of clock() for timeouts.