tree ae3664d68ef052cc7777a3d8f4aac261011ecccc
parent 826215bec2643b30fc8236525ab269529e20f6b5
parent 06abe13c5f7a318eef316268d0d25d92ff128c19
author Elliott Hughes <enh@google.com> 1350497119 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350497119 -0700

am 06abe13c: am a2f596b6: Merge "Make dlerror(3) thread-safe."

* commit '06abe13c5f7a318eef316268d0d25d92ff128c19':
  Make dlerror(3) thread-safe.