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

This commit is contained in:
Jim Miller 2010-06-07 19:24:45 -07:00 committed by Android (Google) Code Review
commit c354b89c76

Diff Content Not Available