am 6c3e7f5d: Fix problem in waking up path

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

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