merge from open-source master

Change-Id: If02d33af51017dbd85e91c79ac2e848eda6cf253
This commit is contained in:
The Android Open Source Project
2010-05-03 15:33:05 -07:00
189 changed files with 7416 additions and 232 deletions

View File

@@ -397,7 +397,7 @@ size_t wcsxfrm(wchar_t *ws1, const wchar_t *ws2, size_t n)
int wctob(wint_t c)
{
return c;
return c;
}
wctype_t wctype(const char *property)