tree 38e955c06c65c1bc04ba82d08ba20bc84e2754a7
parent 332f35813e9860b8469b0f804f2b576daa0c823f
parent daa0ee137d43850c834b1ead3f871ceaa49814a7
author Nick Kralevich <nnk@google.com> 1401526265 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1401526265 +0000

am daa0ee13: am 4f8785f2: Merge "SELinuxMMAC additions to perform policy versioning checks."

* commit 'daa0ee137d43850c834b1ead3f871ceaa49814a7':
  SELinuxMMAC additions to perform policy versioning checks.