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

am ccf236ae: (-s ours) mako: update prebuilt kernel [DO NOT MERGE] automerge: e019ca9  -s ours automerge: 0cfa6ae  -s ours automerge: c1f5ea4  -s ours automerge: 449956b  -s ours automerge: 5793efb  -s ours automerge: 3c1d69f  -s ours automerge: a0d5d84  -s ours

* commit 'ccf236ae3aa932d37a8beab9c1bbe38983a7d0a2':