am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake...
am e25a264c: Merge "DO NOT MERGE. Wifi service now blames apps for its wake lock use." into gingerbread
Merge commit 'e25a264c' into gingerbread-plus-aosp
* commit 'e25a264c':
DO NOT MERGE. Wifi service now blames apps for its wake lock use.