]> Gitweb @ Texas Instruments - Open Source Git Repositories - git.TI.com/gitweb - android-sdk/platform-bionic.git/commitdiff
am 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)."
authorElliott Hughes <enh@google.com>
Fri, 22 Nov 2013 01:15:03 +0000 (17:15 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 22 Nov 2013 01:15:03 +0000 (17:15 -0800)
* commit '70d37e343aa0c8c771e01259377c98958fbfd3ee':
  Switch to upstream sleep(3) and usleep(3).

1  2 
libc/Android.mk

diff --cc libc/Android.mk
Simple merge