tree 18a2652ce2e48c1acef618018db31b75f79c172e
parent 835f5cb7e5d60a541c40454bb76e1900d8cdfb8b
parent 4ff85ad26acab3f4bbab6195c5e092999164f7d8
author Kenny Root <kroot@google.com> 1350493828 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1350493828 -0700

am 4ff85ad2: am 50d42703: Merge "Remove HAVE_SELINUX guards"

* commit '4ff85ad26acab3f4bbab6195c5e092999164f7d8':
  Remove HAVE_SELINUX guards