OSDN Git Service

resolved conflicts for merge of 7b6e6fa5 to kraken
authorJean-Baptiste Queru <jbq@google.com>
Thu, 3 Jun 2010 22:05:04 +0000 (15:05 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Thu, 3 Jun 2010 22:05:04 +0000 (15:05 -0700)
commita8a21488630980c1d2a2152d0ac39bd7978879e2
treeaa2c3da5f3cfb2eb44933b5126984940b2c02e59
parentfcd00ebbdf3e7f4e1e7782a65ae10fb0fc03a1aa
parent7b6e6fa57240466c2728d553be136f800600dd71
resolved conflicts for merge of 7b6e6fa5 to kraken

Change-Id: I2b9b80a7fa32c56be2b85ff8be0d6e7ac1848afe
libc/bionic/pthread.c
libc/include/pthread.h