tree 7cff0eb3e24a20c7afff17a90c275dcb4819c5ee
parent 5b2c1764c0dd87d35607924592576cc032a2e5be
parent 31326aeb6e33ba0d7acc73f391d8c0820946f169
author Nick Kralevich <nnk@google.com> 1404963882 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1404963882 +0000

am 31326aeb: am 2fb3b804: am 1c524977: Merge "Upgrade SELinux policy for N5 DRM crypto"

* commit '31326aeb6e33ba0d7acc73f391d8c0820946f169':
  Upgrade SELinux policy for N5 DRM crypto