tree 79d7770bae9b306acb0394ce67f4f72a86c030b6
parent 2fde4bf8312ee8e8d67aa03a441bbd7783b132db
parent 5502d0f56e7a8c238f03ae639406ffc9ef1f7dce
author Benoit Goby <benoit@android.com> 1329515593 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1329515593 -0800

am 5502d0f5: wingray: update kernel -- DO NOT MERGE

* commit '5502d0f56e7a8c238f03ae639406ffc9ef1f7dce':
  wingray: update kernel -- DO NOT MERGE