tree 515d71f6332460c8808b803cdf1413c21a7f009d
parent 53de4eca5973a6c4d4bd2b966f753901cfdb9743
parent 1dad12978071e59c0a94034d973855729b8b6f54
author JP Abgrall <jpa@google.com> 1357861142 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1357861142 -0800

am 1dad1297: (-s ours) am eae5a871: am 7f6968fb: manta: prebuilt kernel -- DO NOT MERGE

* commit '1dad12978071e59c0a94034d973855729b8b6f54':
  manta: prebuilt kernel -- DO NOT MERGE