tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 194b74adce87f19d6a45f2cc403a37a1897de2f1
parent fc294406b585e3ab2ed8474a6494b1cb1f774bc8
author Vineeta Srivastava <vsrivastava@google.com> 1414262300 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414262300 +0000

am fc294406: (-s ours) mako: update prebuilt kernel [DO NOT MERGE] automerge: 9c3d114  -s ours automerge: f5f5449  -s ours automerge: c8247b6  -s ours automerge: d9fcabf  -s ours

* commit 'fc294406b585e3ab2ed8474a6494b1cb1f774bc8':