tree 16cdaac750efe72b060fa334fb6a1cf027f59dc6
parent d306cc8192bf569b2e6e7d58b4d73f6607e9d509
parent 76d9bf52f31b8f31f64348b736422861c90ab463
author Joe Onorato <joeo@android.com> 1280247588 -0700
committer Android Git Automerger <android-git-automerger@android.com> 1280247588 -0700

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