tree d7ca171853e510363e667cde0b22d434207a5794
parent c7e18f46a80fbe5d95b01316eb83fddd5f0869fe
parent f122d1cb99f0f510625c11fb3f6d3e47adaf585c
author Kenny Root <kroot@google.com> 1350437962 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350437962 -0700

am f122d1cb: Merge "Remove HAVE_SELINUX guards"

* commit 'f122d1cb99f0f510625c11fb3f6d3e47adaf585c':
  Remove HAVE_SELINUX guards