OSDN Git Service

resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 23 Jul 2010 20:53:19 +0000 (13:53 -0700)
committerJean-Baptiste Queru <jbq@google.com>
Fri, 23 Jul 2010 20:53:19 +0000 (13:53 -0700)
commit6d4d8cb79c5578d33ab17806d67b1e53a730fbc3
tree9642a50962a867b9cf1a37a53e7485bfad00f256
parent4e69dfed0b0fe672e366bb84d5c3feaedc61d630
parent4f086aeb4aa06e13079b7fec71a8178ceeacf318
resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp

Change-Id: Ice2a6d41a7e9d04eca02e15ed189d648d61b5801
libc/Android.mk
libc/bionic/fork.c
libc/docs/CHANGES.TXT
libc/include/pthread.h