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

Merge commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426'

* commit '227afd3a1b1a32891e5e20c79fd98b2ccf982426':
  Fix problem where power manager was calling battery stats with bad wl type.
tree: 1e7afed8ff0231c6b168062fa8f04396d6eb7f2f
  1. cmds/
  2. include/
  3. libs/
  4. opengl/
  5. services/
  6. vpn/
  7. MODULE_LICENSE_APACHE2
  8. NOTICE