am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when...
am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo
Merge commit '3110bf6d' into froyo-plus-aosp
* commit '3110bf6d':
Fix inconsistency in how we handle light sensor when battery is low.