tree 01f7eac67d928453ebb3c16181bb60489a6c1d4c
parent 22f625529ec4364c7de9c5857221e2a3b2cda9f1
parent 27888a5ded21182e1f15b19010fd2527fb7e1ef0
author Kenny Root <kroot@android.com> 1354066467 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1354066467 -0800

am 27888a5d: am 9b82ce20: Merge "Document the SELinux extensions to the Android init language."

* commit '27888a5ded21182e1f15b19010fd2527fb7e1ef0':
  Document the SELinux extensions to the Android init language.