tree df6f1892a2dcbe3d4170c62dc0a1b8efd476742b
parent c504b8eeab944644c8c4eb1e6a1f48da8ee85398
parent 4dbcd1c4ae5a978581d8cc806a3dec7ebd0426a1
author Dmitry Shmidt <dimitrysh@google.com> 1331835431 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331835431 -0700

am 4dbcd1c4: (-s ours) am 681a6220: am 22c420fc: stingray: Kernel prebuilt -- DO NOT MERGE

* commit '4dbcd1c4ae5a978581d8cc806a3dec7ebd0426a1':