tree dc7a2376d1b713062dfe2e22081241f7ed455b70
parent a9d563290e7827a02e8c2cedc2c8ca616a6aeac8
parent 649329c3da31bd808b777c1bad83edf078f4d651
author Mike Lockwood <lockwood@android.com> 1276208911 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1276208911 -0700

Merge "Don't adjust lights if screen or button brightness is changed when the screen is off." into froyo