tree 7b2f179ed87fbdff376abbb6acd1aba539ee6763
parent e1082e80e799d341e1bc762365ed3952e702a39f
parent 50d898cd3cec7acce1a7172813403c6d1a10db97
author Dmitry Shmidt <dimitrysh@google.com> 1330392010 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330392010 -0800

am 50d898cd: am 8a27da99: wingray: update kernel -- DO NOT MERGE

* commit '50d898cd3cec7acce1a7172813403c6d1a10db97':