tree 71352fd36543f23ab69114999a12d5258ec9523d
parent cc9bd5f5beba55f60da51ede6b3739f0ee18077f
parent 8735d726249e81f262dab35486310a2b3bb29023
author Dmitry Shmidt <dimitrysh@google.com> 1330442384 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1330442384 -0800

am 8735d726: (-s ours) am 50d898cd: am 8a27da99: wingray: update kernel -- DO NOT MERGE

* commit '8735d726249e81f262dab35486310a2b3bb29023':