tree 5bccdcd77bf39b40ca85aca3ee13d5b5c8841384
parent a51c4d7eeea4a8a44ff0149c29e1c2ff921a1f1b
parent c6d1352ec9206fd0f0b8369b403246ad529293d1
author Benoit Goby <benoit@android.com> 1330010989 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330010989 -0800

am c6d1352e: (-s ours) am 167a2697: am 5502d0f5: wingray: update kernel -- DO NOT MERGE

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