OSDN Git Service

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)
commit6b9d2d6839fcb6f2049ae67214dbbc711fc399fd
tree54ada0f654666110e1e79d879ffefe159426c10f
parentcc1a72b280bd82eeaa3081c29ab61ca91a461dd9
parent6d4d8cb79c5578d33ab17806d67b1e53a730fbc3
am 6d4d8cb7: resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp

Merge commit '6d4d8cb79c5578d33ab17806d67b1e53a730fbc3'

* commit '6d4d8cb79c5578d33ab17806d67b1e53a730fbc3':
  Implemented pthread_atfork()
libc/Android.mk