am 686af0b3: resolved conflicts for merge of defd1622 to gingerbread-plus-aosp

author repo sync <digit@google.com>

Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)

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

Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
author repo sync <digit@google.com>
Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
committer Android Git Automerger <android-git-automerger@android.com>
Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
diff --cc libc/Android.mk
Simple merge
diff --cc libc/include/sys/linux-unistd.h
Simple merge
author	repo sync <digit@google.com>
	Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
committer	Android Git Automerger <android-git-automerger@android.com>
	Tue, 28 Sep 2010 19:48:34 +0000 (12:48 -0700)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
libc/include/sys/linux-unistd.h	patch \|	diff1 \|	diff2 \|	blob \| history