tree e94b4cb1841761d211577f9ae8fb20a05031fd51
parent 28891d262f21988ef3d43e4a3dfca0c9d4370cf8
parent fbb4188cfac18b457801cf3e304bfa39dd29dde8
author Elliott Hughes <enh@google.com> 1411488352 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1411488352 +0000

am fbb4188c: am d559d6c7: Merge "defined(HAVE_OFF_T) is really just !defined(__APPLE__)."

* commit 'fbb4188cfac18b457801cf3e304bfa39dd29dde8':
  defined(HAVE_OFF_T) is really just !defined(__APPLE__).