tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 9c280161d7460fa04a4867ced2c6015a4afd99ba
parent fd25da9439a85a38db2313ac2118b2e15d42693b
author Iliyan Malchev <malchev@google.com> 1414017899 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414017899 +0000

am fd25da94: (-s ours) am 49f6476f: am ae19f6bc: mako: update prebuilt kernel

* commit 'fd25da9439a85a38db2313ac2118b2e15d42693b':
  mako: update prebuilt kernel