| commit | 55578bc652286a6797bd279f9b4fa50540a0cc17 | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Jul 27 09:19:48 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 27 09:19:48 2010 -0700 |
| tree | 83d1eb96c1b64e1b68daa8fb84d7ff61e633acb1 | |
| parent | 48f5248621651fc65179960032cddb1f24f38d9d [diff] | |
| parent | 385adbdbe35d6b386705edb5474b026975b85b4a [diff] |
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 after a phone Merge commit '76d9bf52f31b8f31f64348b736422861c90ab463' into gingerbread-plus-aosp * commit '76d9bf52f31b8f31f64348b736422861c90ab463': Add a method to let a properly permissioned app directly