Joe Onorato d596d5115c 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

2010-07-27 09:26:26 -07:00

..

com/android/server

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

2010-07-27 09:26:26 -07:00

Android.mk

disable emma instrumentation for framework, ext and services (DO NOT MERGE)

2010-05-18 16:02:28 -07:00