tree 94999c9434086f1d1106a04bccc4fa3ac81bb716
parent 0bd6fbd2dcefd1862f18d66dd02fc81b89ce04da
parent 6afd0fdf3e7aab4132c865d6faafbe74ea536fef
author Benoit Goby <benoit@android.com> 1331584195 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1331584195 -0700

am 6afd0fdf: am 55d470d3: wingray: update kernel -- DO NOT MERGE

* commit '6afd0fdf3e7aab4132c865d6faafbe74ea536fef':
  wingray: update kernel -- DO NOT MERGE