tree 6c88f3f2bbaa63df4239d3698f2d1a366262c5a8
parent 6c84d5b6687fe51db1d78aa978981a7cdda4b9a7
parent 6c3e7f5dcb9c7319a5541993c0516594dfffb916
author Dmitry Shmidt <dimitrysh@google.com> 1253222963 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1253222963 -0700

am 6c3e7f5d: Fix problem in waking up path

Merge commit '6c3e7f5dcb9c7319a5541993c0516594dfffb916' into eclair-plus-aosp

* commit '6c3e7f5dcb9c7319a5541993c0516594dfffb916':
  Fix problem in waking up path