AI 143358: am: CL 143207 am: CL 142996 Fix bug in human readable battery stats...

AI 143358: am: CL 143207 am: CL 142996 Fix bug in human readable battery stats dumping code which caused the wifi lock times to be off by an order of magnitude.
  Original author: emillar
  Merged from: //branches/cupcake/...
  Original author: android-build
  Merged from: //branches/donutburger/...

Automated import of CL 143358