Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp * commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177': Various battery info things:
Merge commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177' into gingerbread-plus-aosp * commit 'a8d9291d7f93d1aa0d24d71d65c7de2894812177': Various battery info things: