am 8e1ee7fd: merge from open-source master

This commit is contained in:
The Android Open Source Project 2010-05-17 15:03:01 -07:00 committed by Android Git Automerger
commit 204e82d0af
15 changed files with 56 additions and 57 deletions

View File

@ -39,7 +39,6 @@
static int
eofread(void *cookie, char *buf, int len)
{
return (0);
}