tree f0cd38b301d484d703b61094540fb09640bc2c43
parent 169fac909ec01042044a505bca6ecf853514ae40
parent f617d316ba92c508a2e46b4d57d35a1ce3554f3e
author Zach Jang <zachjang@google.com> 1445971742 +0000
committer android-build-merger <android-build-merger@google.com> 1445971742 +0000

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

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