tree 214024b069be9a02452591731feaa70ecfea93a0
parent 95e1d3c2ee23b6fa82ce94e04c93af8b393cd029
parent 31f18bd9d70d546dd49b7a04f8fcd6cd235ea57f
author Benoit Goby <benoit@android.com> 1330978304 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330978304 -0800

am 31f18bd9: wingray: update kernel -- DO NOT MERGE

* commit '31f18bd9d70d546dd49b7a04f8fcd6cd235ea57f':
  wingray: update kernel -- DO NOT MERGE