commit | 057c13bcce4d6f6a35fe7a096e1d1774de003fad | [log] [tgz] |
---|---|---|
author | Jean-Baptiste Queru <jbq@google.com> | Mon Oct 11 18:58:25 2010 -0700 |
committer | Android Git Automerger <android-git-automerger@android.com> | Mon Oct 11 18:58:25 2010 -0700 |
tree | a04d991043bcec3896b40feebdf73b9e11f1a45d | |
parent | 81bef57f6d77d64d914e14f77ee9594f1a390077 [diff] | |
parent | c43189e76964facad8bac6ee7a17ea1016bba4e3 [diff] |
am c43189e7: am 2aaa1ce1: Merge "Hold partial wakelock during shutdown to avoid entering sleep" Merge commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3' * commit 'c43189e76964facad8bac6ee7a17ea1016bba4e3': Hold partial wakelock during shutdown to avoid entering sleep