tree 56502a27d4fb5b2347e52bec0bbf32a840e2d245
parent 26c550ff5c0e3d32d9459565c2950c038f0bdb2c
parent 0ae4f405f0e99ada750d823c57d64de61f77f716
author Benoit Goby <benoit@android.com> 1331584381 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331584381 -0700

am 0ae4f405: (-s ours) am 837c2964: am 55d470d3: wingray: update kernel -- DO NOT MERGE

* commit '0ae4f405f0e99ada750d823c57d64de61f77f716':