tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 9247d837af5e3d6ec5e6c020ac88fc3ed4fe9e53
parent f2f8c543f35b814f662a9f0ea0d7187cf6934e69
author Vineeta Srivastava <vsrivastava@google.com> 1414018286 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414018286 +0000

am f2f8c543: (-s ours) Merge "mako: update prebuilt kernel" into klp-dev

* commit 'f2f8c543f35b814f662a9f0ea0d7187cf6934e69':
  mako: update prebuilt kernel