tree 86d723fb742741d7bc9c432b4b0c464872ccde4c
parent ef7e8dfb1ae659c1f75440c81cf351c90ae899e1
parent 55d470d36c0929067c89fe0f6312ddb8316daab2
author Benoit Goby <benoit@android.com> 1331584122 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331584122 -0700

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

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