tree 811fdedb31aaded259b150b91e704cf97a0233b0
parent 20f5daa8653eb2d81af8c161a2084e3b53ec3914
parent 7b88a90da2a27e347fc16c14fa577f4ae1ef07fd
author Kenny Root <kroot@google.com> 1350493030 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350493030 -0700

am 7b88a90d: Merge "Remove HAVE_SELINUX guards"

* commit '7b88a90da2a27e347fc16c14fa577f4ae1ef07fd':
  Remove HAVE_SELINUX guards