tree 0efe5eeae48d88ebcdfae99c8e85c1f7f3fcbee1
parent 4c2c62fe08c736273dd9fb5910dedc7ecdc5f4b3
parent dc2e5208e2b448a2c481d726818de79ea6a49783
author Chung-yih Wang <cywang@google.com> 1286605805 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1286605805 -0700

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

Merge commit 'dc2e5208e2b448a2c481d726818de79ea6a49783' into gingerbread-plus-aosp

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