tree b74aa191ac219c45a56f93a9e56a4d76bd396e4f
parent 8f9d096fa7a99283e7ca92ed9ceffea943fa1671
parent f96792916771c71bd6a10b22187d9956e4bd0621
author Vineeta Srivastava <vsrivastava@google.com> 1430085871 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1430085871 +0000

am f9679291: (-s ours) am 0d2d0837: (-s ours) hammerhead: update prebuilt kernel automerge: b751c51 automerge: a6565d1

* commit 'f96792916771c71bd6a10b22187d9956e4bd0621':