tree d1d3fe1697073e596c0cb56345f8e5106eb13c6e
parent 743a273e40e49c199d79462338fc606ae12c999f
parent 06b596104a9ed3ac089abd00186a5698d7e8544f
author Elliott Hughes <enh@google.com> 1351627463 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1351627463 -0700

am 06b59610: Merge "Fix bug in pthread_join, pthread_exit, pthread_detach"

* commit '06b596104a9ed3ac089abd00186a5698d7e8544f':
  Fix bug in pthread_join, pthread_exit, pthread_detach