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.
tree: dea944ef79b5fba8dac214b522bd2f9a5623b054
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE