tree 292084cf78605706aa41c37e0bc07a38c4d30133
parent d7ac591f8662a77fbd1a3a2b1ee0c8b6c6fd37de
parent f129c9ec7d4cc32b91e18db5e313f8361e07b56e
author Clay Murphy <claym@google.com> 1374600454 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1374600454 -0700

am f129c9ec: 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 'f129c9ec7d4cc32b91e18db5e313f8361e07b56e':
  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