tree df6f1892a2dcbe3d4170c62dc0a1b8efd476742b
parent aaef81bbfa5cf6f20e9ce908a39ff6b55952e615
parent 21b168e9426ed800aabf58ad55c1592b2aebed22
author Dmitry Shmidt <dimitrysh@google.com> 1331835430 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331835430 -0700

am 21b168e9: (-s ours) am 051e82a1: am 22c420fc: stingray: Kernel prebuilt -- DO NOT MERGE

* commit '21b168e9426ed800aabf58ad55c1592b2aebed22':
  stingray: Kernel prebuilt -- DO NOT MERGE