Merge "Revert "More pthreads cleanup.""

author Elliott Hughes <enh@google.com>

Tue, 12 Feb 2013 06:07:31 +0000 (06:07 +0000)

committer Gerrit Code Review <noreply-gerritcodereview@google.com>

Tue, 12 Feb 2013 06:07:32 +0000 (06:07 +0000)
author Elliott Hughes <enh@google.com>
Tue, 12 Feb 2013 06:07:31 +0000 (06:07 +0000)
committer Gerrit Code Review <noreply-gerritcodereview@google.com>
Tue, 12 Feb 2013 06:07:32 +0000 (06:07 +0000)
diff --cc libc/Android.mk
Simple merge
diff --cc tests/pthread_test.cpp
Simple merge
author	Elliott Hughes <enh@google.com>
	Tue, 12 Feb 2013 06:07:31 +0000 (06:07 +0000)
committer	Gerrit Code Review <noreply-gerritcodereview@google.com>
	Tue, 12 Feb 2013 06:07:32 +0000 (06:07 +0000)
		1	2
libc/Android.mk	patch \|	diff1 \|	diff2 \|	blob \| history
tests/pthread_test.cpp	patch \|	diff1 \|	diff2 \|	blob \| history