tree db9199af29a0d15ac74f0fc8615abfb35e7dc4c3
parent 8fb0da6a5025aa8c0773733669cd8410a6ad54cd
parent c7642d4fff69d8b5397fa57bf01881ba5f003f9c
author Vineeta Srivastava <vsrivastava@google.com> 1414266735 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1414266735 +0000

am c7642d4f: (-s ours) mako: update prebuilt kernel automerge: 7fb7235 automerge: 35c46b8

* commit 'c7642d4fff69d8b5397fa57bf01881ba5f003f9c':