tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 981b8c6b5f8a745d64ddcf475f9402ac8f027d8f
parent 7c85cd285c2153966e3c26822e1a407a59499bb8
author Iliyan Malchev <malchev@google.com> 1414265962 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414265962 +0000

am 7c85cd28: (-s ours) mako: update prebuilt kernel automerge: f0eec87 automerge: 3370c5e

* commit '7c85cd285c2153966e3c26822e1a407a59499bb8':
  mako: update prebuilt kernel