| commit | 6fdab099d647353991e0a9cf4c91858085a9fffc | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Jul 27 09:26:26 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 27 09:26:26 2010 -0700 |
| tree | 7845c43fd30484b450d101f924bc70d1b7f6c8f8 | |
| parent | c26f294821c6f46a50747b143a15f4fefb430647 [diff] | |
| parent | 55578bc652286a6797bd279f9b4fa50540a0cc17 [diff] |
am 070433ed: am 76d9bf52: am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly manipulate the user activity timeout. We should come up with a better API for this, but this is for a last minute power manager hack to turn off the screen sooner a Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4' * commit '070433edee72de5fd9b93ddf055f74277f0deff4': Add a method to let a properly permissioned app directly