tree 2bf7eaa40f2e5dfad4bae2d1604771515d8a5820
parent 605103fb553a8b872aa8dd0aef76ae8b3bfe47fa
parent 11c783f1ead9f276e8854cb1adaebeed8517e8a1
author Kenny Root <kroot@android.com> 1344878577 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1344878577 -0700

am 11c783f1: am 9494f297: Merge "Implement SELinux/MAC checks for property service."

* commit '11c783f1ead9f276e8854cb1adaebeed8517e8a1':
  Implement SELinux/MAC checks for property service.