tree cb57b64e443aafb0a0fd13846b7fc15486227a90
parent c9d808f0ded435cd02254840acb1ea8aa6a7b5d3
parent 31f18bd9d70d546dd49b7a04f8fcd6cd235ea57f
author Benoit Goby <benoit@android.com> 1330978332 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330978332 -0800

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

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