tree b74aa191ac219c45a56f93a9e56a4d76bd396e4f
parent cb60bb243a248366d25e10b45a515349cd913599
parent 8be15c9c012d9cd69d8b9d3008b83572d073e35c
author Vineeta Srivastava <vsrivastava@google.com> 1430085811 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430085811 +0000

am 8be15c9c: (-s ours) am 67596488: (-s ours) Merge "Revert "Revert "Revert "hammerhead: update prebuilt kernel""""

* commit '8be15c9c012d9cd69d8b9d3008b83572d073e35c':