tree cd7c3110a002bd73600af505967943cbeb2f486a
parent 9a2c54432e9740c8ee902f0f7c385283866c284c
parent 31f18bd9d70d546dd49b7a04f8fcd6cd235ea57f
author Benoit Goby <benoit@android.com> 1330978357 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330978357 -0800

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

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