tree 9d48762a629caa8bc3c7e05755a5c8e836bfbf14
parent 27f086928bc62ed5744c1f6c7b7f5dc8593a3d7c
parent 171040c6bd85293e352ba7a5e461b1b945223f0c
author Andrew Hsieh <andrewhsieh@google.com> 1345250905 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1345250905 -0700

am 171040c6: am bd37ac2e: Merge "Make sys/ioctl_compat.h portable."

* commit '171040c6bd85293e352ba7a5e461b1b945223f0c':
  Make sys/ioctl_compat.h portable.