tree b922eeb8acb18699be7e642f054bd788827c84d1
parent 1e40ace49e25ee4c469ed4613fe09656d3c0a5d7
parent a316725740ac123de65e225f5bfbf99450f66e6b
author Elliott Hughes <enh@google.com> 1363929769 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1363929769 -0700

am a3167257: am babb72dc: Merge "Fix pthread_setname_np\'s behavior on invalid pthread_ts."

* commit 'a316725740ac123de65e225f5bfbf99450f66e6b':
  Fix pthread_setname_np's behavior on invalid pthread_ts.