tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent e21d018435ea9d65c821c75b89137dfa35085e99
parent 8997a63271badb521415ace2423d927f09ecdb7c
author Ed Heyl <edheyl@google.com> 1414017982 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414017982 +0000

am 8997a632: (-s ours) am 257285c5: (-s ours) reset to 12c92cdf, but keep bad history for fast forward

* commit '8997a63271badb521415ace2423d927f09ecdb7c':
  mako: update prebuilt kernel