| commit | 500c086a7e93dd485dc98bae5ab8430bc165c301 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Tue Sep 09 21:56:14 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 21:56:14 2014 +0000 |
| tree | 8fdd0e0689f5dbd89b0be210734aff7ba518cee2 | |
| parent | 75ec33e0e609e3ef074f4230c2227e52bf82ad06 [diff] | |
| parent | 5ef471c5f986a52c681a29856c38f72127cdf8ac [diff] |
am 5ef471c5: Merge "Use time() instead of clock() for timeouts." into lmp-dev * commit '5ef471c5f986a52c681a29856c38f72127cdf8ac': Use time() instead of clock() for timeouts.