tree a5f55a64c5119ba31a0c30e4d61683e8b64d0d8c
parent cfff36df2bebd95f2663b7b053c6308593c343dd
parent f9c5afb1f9d8e615ab98774a10bbf117962db66d
author Jean-Baptiste Queru <jbq@google.com> 1329933292 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329933292 -0800

am f9c5afb1: Merge "Redesign dlopen() locks to be recursive per thread."

* commit 'f9c5afb1f9d8e615ab98774a10bbf117962db66d':
  Redesign dlopen() locks to be recursive per thread.