resolved conflicts for merge of 6a51defa to gingerbread-plus-aosp

Change-Id: I0367bcffe9179904ca820e3b824dddfa47594f63

diff --cc libc/Android.mk
index 32bf932,f700ca0..8b54f3e
--- 1/libc/Android.mk
--- 2/libc/Android.mk
+++ b/libc/Android.mk
@@@ -350,8 -363,6 +365,7 @@@ libc_common_src_files += 
  # can set breakpoints in them without messing
  # up any thumb code.
  libc_common_src_files += \
-       bionic/pthread.c.arm \
 +      bionic/pthread-atfork.c.arm \
        bionic/pthread-rwlocks.c.arm \
        bionic/pthread-timers.c.arm \
        bionic/ptrace.c.arm
@@@ -386,8 -400,6 +403,7 @@@ libc_common_src_files += 
        arch-x86/string/strcmp_wrapper.S \
        arch-x86/string/strncmp_wrapper.S \
        arch-x86/string/strlen.S \
-       bionic/pthread.c \
 +      bionic/pthread-atfork.c \
        bionic/pthread-rwlocks.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c
@@@ -424,8 -439,6 +443,7 @@@ libc_common_src_files += 
        string/strncmp.c \
        string/memcmp.c \
        string/strlen.c \
-       bionic/pthread.c \
 +      bionic/pthread-atfork.c \
        bionic/pthread-rwlocks.c \
        bionic/pthread-timers.c \
        bionic/ptrace.c \

diff --cc libc/docs/CHANGES.TXT
Simple merge