| commit | 5df692fd4ec8d06422e6bf130ebfc1f6df8f4b41 | [log] [tgz] |
|---|---|---|
| author | Elliott Hughes <enh@google.com> | Thu Nov 21 20:08:22 2013 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 21 20:08:22 2013 -0800 |
| tree | d8880f599e120f47647407333e8303863ab38192 | |
| parent | 3bc173dfad0adc4afeea03029ca7197cdaa0395b [diff] | |
| parent | a38dcc0210ad2f75aac72e2c3bef357bddb7b564 [diff] |
am a38dcc02: am 70d37e34: am ca045a19: Merge "Switch to upstream sleep(3) and usleep(3)." * commit 'a38dcc0210ad2f75aac72e2c3bef357bddb7b564': Switch to upstream sleep(3) and usleep(3).