tree f0cd38b301d484d703b61094540fb09640bc2c43
parent 8dddcd3b7e19f5b486d5fa4542c12bbec8f16797
parent b161ef57a0e6ce90c6d3b566351acdf206bef318
author Zach Jang <zachjang@google.com> 1445976959 +0000
committer android-build-merger <android-build-merger@google.com> 1445976959 +0000

Merge "Revert "Revert "hammerhead: update prebuilt kernel""" into mnc-dev
am: b161ef57a0  -s ours

* commit 'b161ef57a0e6ce90c6d3b566351acdf206bef318':
  Revert "Revert "hammerhead: update prebuilt kernel""