Joe Onorato 76d9bf52f3 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

2010-07-27 09:14:42 -07:00

..

config

…

java

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

2010-07-27 09:14:42 -07:00

jni

Fixed bug in BitmapFactory.decodeStream

2010-07-23 13:40:59 -07:00

res

Fix 2797185: Re-enable thumbnail generation in framework

2010-07-13 18:35:14 -07:00

tests

am 28fe43be: Merge "Add the hook which can set the device to connect to wifi and in airplane mode after reboot. This is for the power test." into froyo

2010-07-16 15:15:44 -07:00