tree c7437051f8309ae7e3af1d35a3e6eed23fd00ebc
parent 2768efdf9fe67d179f6cb733e6541f04b6f2bf46
parent 7e0d30667cf53a182525f87dd0c8cb0e2628a1ed
author Nick Kralevich <nnk@google.com> 1389643155 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389643155 +0000

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

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