| commit | 625ae1d0023f21a3a353c41322d47dd2e0af55c0 | [log] [tgz] |
|---|---|---|
| author | Christopher Ferris <cferris@google.com> | Tue Sep 09 22:54:12 2014 +0000 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Sep 09 22:54:12 2014 +0000 |
| tree | 8fdd0e0689f5dbd89b0be210734aff7ba518cee2 | |
| parent | 500c086a7e93dd485dc98bae5ab8430bc165c301 [diff] | |
| parent | 11c13abd56693d4a4be3ca9e14cbaa456ba586b9 [diff] |
am 11c13abd: Merge "Use time() instead of clock() for timeouts." * commit '11c13abd56693d4a4be3ca9e14cbaa456ba586b9': Use time() instead of clock() for timeouts.