am 8c65ee2d: Merge "Add a method to let a properly permissioned app directly...

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 '8c65ee2d' into gingerbread

* commit '8c65ee2d':
  Add a method to let a properly permissioned app directly