Jim Miller 7d70358a03 am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo ...

Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into kraken

* commit 'bde25c207731783a62e3611586fe05cd35add0d9':
  Fix 2737842: disable keyguard API when device policy is enabled.

2010-06-07 19:25:49 -07:00

..

java

am bde25c20: Merge "Fix 2737842: disable keyguard API when device policy is enabled." into froyo

2010-06-07 19:25:49 -07:00

jni

GPS: Support for GPS HAL managing its own scheduling

2010-04-14 19:38:26 -04:00

tests/servicestests

…