tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent f112eebed3dda06578380848a1922b060943aec3
parent c534b3256120fae723df655947446c6e2d907da9
author Ed Heyl <edheyl@google.com> 1414018292 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414018292 +0000

am c534b325: (-s ours) merge in release branch changes (no-op).

* commit 'c534b3256120fae723df655947446c6e2d907da9':
  mako: update prebuilt kernel