tree 9e57ee1c0f71a6cebb8908b78e57137903929800
parent 588753bc1cf7dc5547d6795e4d40e57997cd8e00
parent 0bd6fbd2dcefd1862f18d66dd02fc81b89ce04da
author Benoit Goby <benoit@android.com> 1331245378 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1331245378 -0800

am 0bd6fbd2: (-s ours) am d13ffc7d: am 62404021: wingray: update kernel -- DO NOT MERGE

* commit '0bd6fbd2dcefd1862f18d66dd02fc81b89ce04da':