tree 13df02c087b4af121dc9b1803d4002ce93bf1557
parent 5b48eee5152f9e67401efd1845603dc032b532dc
parent 55d470d36c0929067c89fe0f6312ddb8316daab2
author Benoit Goby <benoit@android.com> 1331584095 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331584095 -0700

am 55d470d3: wingray: update kernel -- DO NOT MERGE

* commit '55d470d36c0929067c89fe0f6312ddb8316daab2':
  wingray: update kernel -- DO NOT MERGE