| commit | d596d5115c0f568472daec4f094807bcd39d1f0f | [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 | 5b8aff71d60e33676208d78bccc85febf1c4d518 | |
| parent | 6688214f7f920d7d38c943ce5247ea5a0c570eae [diff] | |
| parent | 070433edee72de5fd9b93ddf055f74277f0deff4 [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