tree a8a95bac07cf511c84de00c50dd7add3a7f2e1a4
parent 9c102ccf9517637f9d293b4e52f9a40573d8fc1d
parent 305a999589a8dfde077589106853522d483d24d2
author Nick Kralevich <nnk@google.com> 1362162411 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1362162411 -0800

am 305a9995: am 8fa924e5: Merge "unistd.h: don\'t include sys/capability.h"

* commit '305a999589a8dfde077589106853522d483d24d2':
  unistd.h: don't include sys/capability.h