tree d52259a783628e2860df9e6cd18a39a9fec0dd38
parent 31c9145ace8ed620b0078808ecfba5e72b70e15b
parent df5321c1d054b1964661a10f8b9ad6ff97679c20
author Benoit Goby <benoit@android.com> 1330978455 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330978455 -0800

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

* commit 'df5321c1d054b1964661a10f8b9ad6ff97679c20':
  wingray: update kernel -- DO NOT MERGE