3bd5e2b22e
Merge commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760' into eclair-plus-aosp * commit 'e69335f8b4f4195e57613fe6b83e18e23e0c2760': Add better APIs for the battery status, and other cleanup.