tree 6cf2e2a5fb3fc5fbefaf2c3c3fbc688410667089
parent 15c401d4acb37d89110af798d463ffb061cbaf83
parent 39804dcde6c1c596285432b28cdb09382ce59663
author Elliott Hughes <enh@google.com> 1360968485 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1360968485 -0800

am 39804dcd: Merge "Fix the pthread_setname_np test."

* commit '39804dcde6c1c596285432b28cdb09382ce59663':
  Fix the pthread_setname_np test.