Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp * commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb': Various improvements to battery stats collection
Merge commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb' into gingerbread-plus-aosp * commit '6b7b4845212b3a439c527f2e1eca205b6b45fceb': Various improvements to battery stats collection