tree 882da7e2f63b38d5f3b32ec1a16f816b538b73d4
parent 86088459c95d2115ef5352fee05074f2e9c5f5c1
parent 05ea8ca1a51b046a210f73e94c7e21541f87c0a7
author Benoit Goby <benoit@android.com> 1330978603 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330978603 -0800

am 05ea8ca1: (-s ours) am df5321c1: am 31f18bd9: wingray: update kernel -- DO NOT MERGE

* commit '05ea8ca1a51b046a210f73e94c7e21541f87c0a7':
  wingray: update kernel -- DO NOT MERGE