am e25a264c: Merge "DO NOT MERGE.  Wifi service now blames apps for its wake lock use." into gingerbread

Merge commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15' into gingerbread-plus-aosp

* commit 'e25a264c4e3739913798d9b7d91af5dc964b0f15':
  DO NOT MERGE.  Wifi service now blames apps for its wake lock use.