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