tree b74aa191ac219c45a56f93a9e56a4d76bd396e4f
parent 2e914dd602fbc2f1ed5b2777738cec1c6f7afc28
parent 2957897810af7a849782dd65cdc1b0ab572be572
author Patrick Tjin <pattjin@google.com> 1430085646 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430085646 +0000

am 29578978: (-s ours) am 494203a6: (-s ours) hammerhead: update prebuilt kernel

* commit '2957897810af7a849782dd65cdc1b0ab572be572':