am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling...
am 227afd3a: am 1188f5e7: Merge "Fix problem where power manager was calling battery stats with bad wl type." into gingerbread
Merge commit '227afd3a'
* commit '227afd3a':
Fix problem where power manager was calling battery stats with bad wl type.