OSDN Git Service

am 5ef471c5: Merge "Use time() instead of clock() for timeouts." into lmp-dev
authorChristopher Ferris <cferris@google.com>
Tue, 9 Sep 2014 21:56:14 +0000 (21:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 9 Sep 2014 21:56:14 +0000 (21:56 +0000)
commit500c086a7e93dd485dc98bae5ab8430bc165c301
tree8fdd0e0689f5dbd89b0be210734aff7ba518cee2
parent75ec33e0e609e3ef074f4230c2227e52bf82ad06
parent5ef471c5f986a52c681a29856c38f72127cdf8ac
am 5ef471c5: Merge "Use time() instead of clock() for timeouts." into lmp-dev

* commit '5ef471c5f986a52c681a29856c38f72127cdf8ac':
  Use time() instead of clock() for timeouts.