tree c48643b5ef66002109c21e040b1bcb114d503dd5
parent eef8db56c15f59296d1aa36aaeb99abc8a5af969
parent 5b48eee5152f9e67401efd1845603dc032b532dc
author Benoit Goby <benoit@android.com> 1331245259 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331245259 -0800

am 5b48eee5: am 62404021: wingray: update kernel -- DO NOT MERGE

* commit '5b48eee5152f9e67401efd1845603dc032b532dc':
  wingray: update kernel -- DO NOT MERGE