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
..
2010-02-17 16:46:42 -08:00
2010-01-29 13:29:51 -08:00
2010-06-03 16:34:18 +08:00
2010-05-12 14:53:25 -07:00
2010-05-19 08:28:32 -07:00
2010-06-03 09:03:58 -07:00
2010-04-28 16:51:52 -07:00
2010-06-04 11:08:36 -07:00