tree 101b80d06df9fe5611083c884198495ccf73ed4d
parent aa7fb3be1b456a2884c3fa707aa590196b2c70c3
parent 10f9a3727a5c46ef23f5f0385ae4ffec20cb46d9
author Jean-Baptiste Queru <jbq@google.com> 1346899612 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1346899612 -0700

am 10f9a372: Merge upstream sepolicy into AOSP

* commit '10f9a3727a5c46ef23f5f0385ae4ffec20cb46d9':
  Corrected gramatical issues
  Added new line to end of file
  Changed seapp_contexts temporary file naming
  Fix mls checking code
  Support overrides in seapp_contexts
  Add tf_daemon labeling support.
  Add ppp/mtp policy.
  per device seapp_context support
  dhcp policy.
  Trusted Execution Environment policy.