am 914528cd: am 223ddfcf: Merge "libc: Add missing pipe2() declaration and implementa...

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

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

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

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