tree 30f7c867a6d913b81247175763f11c4d48e05c00
parent 297777cd5d8c7afd9d82f252c186915cd20e110c
parent 78341f74bf0181f24792989f729ac8403afa23af
author Mike Lockwood <lockwood@android.com> 1271691325 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1271691325 -0700

am ea7c123f: am daa107c8: am 3110bf6d: Merge "Fix inconsistency in how we handle light sensor when battery is low." into froyo