tree df32ae9beec27b98ee98d6910d59b4f86d5503a5
parent d880027282ec902fbe38f794977e83e9541462a8
parent 62c01998990155b8278af340159cac70ed1af4c0
author Ken Sumrall <ksumrall@android.com> 1352834359 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352834359 -0800

am 62c01998: (-s ours) am ff3abf19: am 6e923eb5: manta: kernel prebuilt

* commit '62c01998990155b8278af340159cac70ed1af4c0':
  manta: kernel prebuilt