tree 1e8115ef55cb585bb1b2bcaaae5f1ddc58a25e32
parent 947d92c9631a7e30fd34c5bc5a5e681cca31025f
parent e7a0d2beea698d503385d90e72d1fca937abd966
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