am 833db408: am dc2e5208: Merge "Do not release the wifi lock if the screen is off." into gingerbread

Merge commit '833db40866ebf27be33aa387d08a2cb0b9a4246d'

* commit '833db40866ebf27be33aa387d08a2cb0b9a4246d':
  Do not release the wifi lock if the screen is off.