tree 8767f07a84db35d92aee9a2e44664544bc20d6b1
parent 7c88332701cc9aa2ed95148bed40f50c54adb36b
parent 70d37e343aa0c8c771e01259377c98958fbfd3ee
author Elliott Hughes <enh@google.com> 1385082903 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1385082903 -0800

am 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."

* commit '70d37e343aa0c8c771e01259377c98958fbfd3ee':
  Switch to upstream sleep(3) and usleep(3).