Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp * commit 'ed7755cc30fe6b2b0254207347629ad0cae094db': PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.
Merge commit 'ed7755cc30fe6b2b0254207347629ad0cae094db' into eclair-mr2-plus-aosp * commit 'ed7755cc30fe6b2b0254207347629ad0cae094db': PowerManagerService: Ensure that recent changes do not effect the hardware ALS case.