Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp * commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b': Fix problem where power manager was calling battery stats with bad wl type.
Merge commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b' into gingerbread-plus-aosp * commit '1188f5e76cfcd512c4e2fae00ac0bfba3150bd7b': Fix problem where power manager was calling battery stats with bad wl type.