tree 8effd2f8aa84d3b4297af291d07bd0578baa4a20
parent 27efc8f9d1711134051b45d28b2fc38bfb4c7dc6
parent fc729512375c4f0d351f6f67f0d7f500ea1b9233
author Nick Kralevich <nnk@google.com> 1389642737 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1389642737 -0800

am fc729512: Merge "Set SELinux security contexts correctly for init and services."

* commit 'fc729512375c4f0d351f6f67f0d7f500ea1b9233':
  Set SELinux security contexts correctly for init and services.