tree 4dbaa9b2b013881242590787d8f93809212dbf3f
parent e228efb845ed1bcbd8fbcc8b8a26237e74ae3c7f
parent 1b73b3a53f9e39c21946dd12d48485bcb9fbc620
author Clay Murphy <claym@google.com> 1392246178 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1392246178 +0000

am 1b73b3a5: am 7141d1bc: am df10a2cf: am a7973184: Merge "Docs: Adding hammerhead to the kernel table. Bug: 11715246"

* commit '1b73b3a53f9e39c21946dd12d48485bcb9fbc620':