tree 2e15ffdf92cf895ba3efac7561260c23abd2e41c
parent 6d245d135c5e63defd311efc8000a34abd2d5bb8
parent 39d890d9aed5cb07b8a166a749299b9d24d8f137
author Yabin Cui <yabinc@google.com> 1422402175 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422402175 +0000

am 39d890d9: am 6e32c037: Merge "Kill HAVE_PTHREADS."

* commit '39d890d9aed5cb07b8a166a749299b9d24d8f137':
  Kill HAVE_PTHREADS.