tree 71352fd36543f23ab69114999a12d5258ec9523d
parent 0af3c16cd5278bcde0f0cebca0f877b52589b9af
parent e1082e80e799d341e1bc762365ed3952e702a39f
author Dmitry Shmidt <dimitrysh@google.com> 1330442383 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330442383 -0800

am e1082e80: (-s ours) am e98ae677: am 8a27da99: wingray: update kernel -- DO NOT MERGE

* commit 'e1082e80e799d341e1bc762365ed3952e702a39f':
  wingray: update kernel -- DO NOT MERGE