| commit | 385adbdbe35d6b386705edb5474b026975b85b4a | [log] [tgz] |
|---|---|---|
| author | Joe Onorato <joeo@android.com> | Tue Jul 27 09:14:42 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Jul 27 09:14:42 2010 -0700 |
| tree | 7f918cd2ee1698160c73c94d9229a6c4660c6e7d | |
| parent | 5cf8fa80463fbc5b90ea5a1a5b548c2f99a46aeb [diff] | |
| parent | 38723b069c3fa4a9682083a987d5bba317fdc7af [diff] |
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 call ends." i Merge commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917' into gingerbread * commit '8c65ee2d509db7dcb50ce4530d52eb5bdca3f917': Add a method to let a properly permissioned app directly