Commits
Joe Onorato authored and Android Git Automerger committed d596d5115c0M
am 070433ed: 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 a Merge commit '070433edee72de5fd9b93ddf055f74277f0deff4' * commit '070433edee72de5fd9b93ddf055f74277f0deff4': Add a method to let a properly permissioned app directly
Showing diff to6688214f7f9