tree 3428957eeddb56cf1d7089f98f0b46456fb61765
parent 8e581c94eee35d05de0ed4ef5d7b383e1d4fd107
parent b5d4930d59ee1d2b178a240b017876cce0a6b636
author Patrick Tjin <pattjin@google.com> 1442464026 +0000
committer android-build-merger <android-build-merger@google.com> 1442464026 +0000

hammerhead: update prebuilt kernel [DO NOT MERGE] automerge: a88af8936e  -s ours automerge: c8557e769a  -s ours automerge: 34782e7685  -s ours automerge: 498c3bd48a  -s ours
automerge: b5d4930d59  -s ours

* commit 'b5d4930d59ee1d2b178a240b017876cce0a6b636':
  hammerhead: update prebuilt kernel [DO NOT MERGE]