tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent e58cf805d1fb1cf0565fa251cf44ae965f31521e
parent a3c8ffdaad02e4f5d1f0dfac144228ce9d3c20f5
author Patrick Tjin <pattjin@google.com> 1414263594 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414263594 +0000

am a3c8ffda: (-s ours) mako: update prebuilt kernel [DO NOT MERGE] automerge: 42bca28  -s ours automerge: ed09220  -s ours automerge: 61255f2  -s ours automerge: ad9dc90  -s ours

* commit 'a3c8ffdaad02e4f5d1f0dfac144228ce9d3c20f5':
  mako: update prebuilt kernel [DO NOT MERGE]