239775a2ce
Merge commit '3766ae5551e6231c251b0af38206aea30a49df63' into eclair-mr2-plus-aosp * commit '3766ae5551e6231c251b0af38206aea30a49df63': LightsService cleanup: