tree 8a8fc75747a5cf7df5c11ff1600baf6a2c6059af
parent a01fe46e9ab324814f8f8ff7e94467a2aff045e6
parent 1cda92ea9d19d43ddab71c7f7605710a6a9ee806
author Clay Murphy <claym@google.com> 1389654246 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1389654246 +0000

am 1cda92ea: am 2999ca2c: Merge "Docs: Adding dm-verity to Security section. Bug: 10706838 Staging location: http://claym.mtv.corp.google.com:8091/devices/tech/security/dm-verity.html"

* commit '1cda92ea9d19d43ddab71c7f7605710a6a9ee806':