tree fef8595e78de73d4bfe93dcd309b008212e3a256
parent 2dda21b93f8a8e0fb70de44eae826bc68349813c
parent eb9f7a01b0f501a535d872a957c1102ebb13d1c7
author Jeff Brown <jeffbrown@google.com> 1293136919 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1293136919 -0800

Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread