From: Jean-Baptiste Queru <jbq@google.com>
Date: Fri, 23 Jul 2010 22:04:24 +0000 (-0700)
Subject: am 6d4d8cb7: resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp
X-Git-Tag: android-x86-4.4-r1~1246
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=6b9d2d6839fcb6f2049ae67214dbbc711fc399fd;p=android-x86%2Fbionic.git

am 6d4d8cb7: resolved conflicts for merge of 4f086aeb to gingerbread-plus-aosp

Merge commit '6d4d8cb79c5578d33ab17806d67b1e53a730fbc3'

* commit '6d4d8cb79c5578d33ab17806d67b1e53a730fbc3':
  Implemented pthread_atfork()
---

6b9d2d6839fcb6f2049ae67214dbbc711fc399fd