tree c36a0ec576cfeb799d855a1c96e3c772f113f946
parent b9f0a6eb75aa8f1eec95fb5718d84cef1d0f61b8
parent 82978cae4eec238a9d631d2b61b8985daa02516e
author Ian Rogers <irogers@google.com> 1346856494 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346856494 -0700

am 82978cae: Merge "Avoid malloc lock while calling pthread_atfork."

* commit '82978cae4eec238a9d631d2b61b8985daa02516e':
  Avoid malloc lock while calling pthread_atfork.