| commit | 92537e6ff21d4b20738fae851c2174ea568eb843 | [log] [tgz] |
|---|---|---|
| author | Ed Heyl <ed@google.com> | Mon Oct 31 06:06:27 2011 -0700 |
| committer | Ed Heyl <ed@google.com> | Mon Oct 31 06:06:27 2011 -0700 |
| tree | d5f346884890989c9e8f30ffd982b3ff1c128ae7 | |
| parent | 643baa8b84d5f922c76b85b311d0e1ad4e7204b0 [diff] | |
| parent | b4529b0adca243644f601c9fe5d419c283bf57c1 [diff] |
merged by hand (services/java/com/android/server/PowerManagerService.java needs to be reviewed) Change-Id: I86d1111d86cd1646ebc8a88d58aa393089e9f928