tree 062198c11e314e4363275db6ad04ed48c72e88f3
parent 20914f0ad3691d977f61f1d4b92b49535e8f6f33
parent 18c9394ce1a4869eb5cf91eece02a4e944e2eebc
author Nick Kralevich <nnk@google.com> 1402607197 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1402607197 +0000

am 18c9394c: Merge "Add SELinux checks when adding a service."

* commit '18c9394ce1a4869eb5cf91eece02a4e944e2eebc':
  Add SELinux checks when adding a service.