| commit | 70d37e343aa0c8c771e01259377c98958fbfd3ee | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Wed Nov 20 16:44:59 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Nov 20 16:44:59 2013 -0800 |
| tree | 335fe463aa773ac8484c40e955fec90f126c9e4f | |
| parent | 556c740298a07e586c423480328231cfd50966b6 [diff] | |
| parent | ca045a19234a9323ea0e7eccbe3aefd74f9c1bab [diff] |
am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)." * commit 'ca045a19234a9323ea0e7eccbe3aefd74f9c1bab': Switch to upstream sleep(3) and usleep(3).