tree c187b35ff6e3e03ab165f32a9e942edfa60e00fe
parent df61acbd523271cc9b01b81dbbf5c45799bee6b5
parent 481b0546db69274145ee129d19bb03cce4763c6f
author Elliott Hughes <enh@google.com> 1423013558 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1423013558 +0000

am 481b0546: Merge "Fix non-standard pthread mutex interactions."

* commit '481b0546db69274145ee129d19bb03cce4763c6f':
  Fix non-standard pthread mutex interactions.