tree 20510c326d26ad8b74108b338f27898e48cdeeb4
parent cf1f7bc93297213811036cf331bc7ecce32119e7
parent 9560d31716319be62c97d929f6172c84e267a673
author Yabin Cui <yabinc@google.com> 1422400325 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1422400325 +0000

am 9560d317: Merge "Kill HAVE_PTHREADS."

* commit '9560d31716319be62c97d929f6172c84e267a673':
  Kill HAVE_PTHREADS.