tree d8839b6059c50038cd3d6fe3333984f4f7d82232
parent 6c1f6638206c7a537ee23be7ea2de86a74717b32
parent 89bf52a1ba8a15a89152f4679bd141f213006dd2
author Clay Murphy <claym@google.com> 1374600349 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374600349 -0700

am 89bf52a1: Merge "Docs: Adding SELinux doc to site and nav. Bug: 9175117 Staging location: http://claym.mtv.corp.google.com:8093/devices/tech/security/se-linux.html" into jb-mr2-dev

* commit '89bf52a1ba8a15a89152f4679bd141f213006dd2':
  Docs: Adding SELinux doc to site and nav. Bug: 9175117 Staging location: http://claym.mtv.corp.google.com:8093/devices/tech/security/se-linux.html