am cb0f5ed8: am 50ace4fe: Remove compiler warnings when building Bionic.

author David 'Digit' Turner <digit@google.com>

Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)

committer Android Git Automerger <android-git-automerger@android.com>

Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)
author David 'Digit' Turner <digit@google.com>
Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)
diff --cc libc/Android.mk
Simple merge
diff --cc libc/docs/CHANGES.TXT
Simple merge
author	David 'Digit' Turner <digit@google.com>
	Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Wed, 23 Jun 2010 19:41:50 +0000 (12:41 -0700)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
libc/docs/CHANGES.TXT	patch \|	diff1 \|	diff2 \|	blob \| history