diff options
| author | Joe Onorato <joeo@android.com> | 2010-07-27 09:14:42 -0700 |
|---|---|---|
| committer | Android Git Automerger <android-git-automerger@android.com> | 2010-07-27 09:14:42 -0700 |
| commit | 76d9bf52f31b8f31f64348b736422861c90ab463 (patch) | |
| tree | ab9bfa91f80d6366e575fe85103cdfcaf3bb119b /opengl/tests/gl_basic/gl_basic.cpp | |
| parent | ca57d1cc89d65dfbd59c749c5736574cd08c7bd3 (diff) | |
| parent | 8c65ee2d509db7dcb50ce4530d52eb5bdca3f917 (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
Diffstat (limited to 'opengl/tests/gl_basic/gl_basic.cpp')
0 files changed, 0 insertions, 0 deletions