merge from open-source master

Change-Id: I5804d8850f2d4fb7b5d5c53d51e153f7ced9646e
This commit is contained in:
The Android Open Source Project
2010-05-17 10:22:35 -07:00
15 changed files with 56 additions and 57 deletions

View File

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