4b187e804f
Merge commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b' into gingerbread-plus-aosp * commit '8e1b84e7654ddeeb77a03f5eca10c6669b1cb42b': Some battery improvements: