34502a84eb
Merge commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4' into froyo-plus-aosp * commit 'f4a502a235e9f9ea0bcd2d5ca4981dc6e1a619c4': Don't adjust lights if screen or button brightness is changed when the screen is off.