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

am 55b0b256: (-s ours) am 8d96f493: am 5502d0f5: wingray: update kernel -- DO NOT MERGE

* commit '55b0b256388deb0ac9721b01e6efe75c41d91045':