tree 16e158417e0c192ee27fa80efd71c5c92605c56a
parent 3be2d3d87983fedbfefa5852b32a81dc45d6e1ae
parent fae953ebccfabfa500b3ebca93202063c8e3501d
author Elliott Hughes <enh@google.com> 1418608831 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1418608831 +0000

am fae953eb: Merge "HAVE_ANDROID_OS implies that you have <pthread.h> and <sched.h>."

* commit 'fae953ebccfabfa500b3ebca93202063c8e3501d':
  HAVE_ANDROID_OS implies that you have <pthread.h> and <sched.h>.