tree 5dc64bd7d2b19d7543b8e14c2bc9be76d63e77cd
parent a46286db3429d50296f6fb070f948261b21c5c5d
parent 49382f12f2e8278a02019d78482df00bb7f7fad7
author Nick Kralevich <nnk@google.com> 1378252065 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1378252065 -0700

am 49382f12: am 8328edb0: Merge "init: allow disabling selinux via a kernel command line"

* commit '49382f12f2e8278a02019d78482df00bb7f7fad7':
  init: allow disabling selinux via a kernel command line