tree 94999c9434086f1d1106a04bccc4fa3ac81bb716
parent c88d0868ff03824547b8976824f5d82309afedae
parent 837c296450ad6581be7e331053ca2ea32bb8df2b
author Benoit Goby <benoit@android.com> 1331584284 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331584284 -0700

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

* commit '837c296450ad6581be7e331053ca2ea32bb8df2b':