OSDN Git Service

(root) / android-x86 / bionic.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: cc1a72b 6d4d8cb)
am 6d4d8cb7: resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp
authorJean-Baptiste Queru <jbq@google.com>
Fri, 23 Jul 2010 22:04:24 +0000 (15:04 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Fri, 23 Jul 2010 22:04:24 +0000 (15:04 -0700)
Merge commit '6d4d8cb79c5578d33ab17806d67b1e53a730fbc3'

* commit '6d4d8cb79c5578d33ab17806d67b1e53a730fbc3':
  Implemented pthread_atfork()

1  2 
libc/Android.mk patch | diff1 | diff2 | blob | history

diff --cc libc/Android.mk
Simple merge
bionic
About OSDN
Find Software
Develop Software
Help