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

Browse Source

Merge commit 'bde25c207731783a62e3611586fe05cd35add0d9' into froyo-plus-aosp

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

...

This commit is contained in:

Jim Miller 2010-06-07 19:26:28 -07:00 committed by Android Git Automerger

parent f023c4ce5b c354b89c76

commit 4c58e3ac69

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Show Stats Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available