tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 7d24c4d37d5e479f5b0135debae2d37c02a0b140
parent cab6b49750f6afcaa2d0219024279dabea93e23f
author Patrick Tjin <pattjin@google.com> 1414262301 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414262301 +0000

am cab6b497: (-s ours) mako: update prebuilt kernel [DO NOT MERGE] automerge: b7de901  -s ours automerge: fa84cb3  -s ours automerge: e098d6e  -s ours automerge: 1910e20  -s ours

* commit 'cab6b49750f6afcaa2d0219024279dabea93e23f':