tree 23dcf1a5f15e1bc1c4f637c813eb6cfd0990a3a7
parent a8af928f4e7dc3e0cd00bdaa0c168ac53fcd9bc0
parent 852b358185a910bb3bdc9cec1ef3752c9bb4c522
author Andrew Hsieh <andrewhsieh@google.com> 1356030246 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1356030246 -0800

am 852b3581: Merge "Sync pthread.h and resolv.h"

* commit '852b358185a910bb3bdc9cec1ef3752c9bb4c522':
  Sync pthread.h and resolv.h