commit | 8b71943942941d4404be2758b1ac817f1692264f | [log] [tgz] |
---|---|---|
author | Jeff Brown <jeffbrown@google.com> | Thu Dec 23 14:27:29 2010 -0800 |
committer | Android Git Automerger <android-git-automerger@android.com> | Thu Dec 23 14:27:29 2010 -0800 |
tree | 0f0fa7e60276161e63044426d7d53d426bdaa89f | |
parent | 7f2b6c270bb0cf904632a8290c41d527ebb9b00f [diff] | |
parent | fa93584a4fab6ca8d9348658dc30cedf76891753 [diff] |
am fa93584a: (-s ours) am c6f2b3b3: Merge "Fix policy issues when screen is off. (DO NOT MERGE)" into gingerbread * commit 'fa93584a4fab6ca8d9348658dc30cedf76891753': Fix policy issues when screen is off. (DO NOT MERGE)