tree f0cd38b301d484d703b61094540fb09640bc2c43
parent b4ddf3c19a378da85936741c62cc08d685b3036f
parent 1b254186411c9ece63c5683c7813e816a16d87f9
author Zach Jang <zachjang@google.com> 1446137121 +0000
committer android-build-merger <android-build-merger@google.com> 1446137121 +0000

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

* commit '1b254186411c9ece63c5683c7813e816a16d87f9':
  Revert "Revert "hammerhead: update prebuilt kernel""