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

2010-06-07 19:24:45 -07:00

..

com/android/server

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

2010-06-07 19:24:45 -07:00

Android.mk

move event log tags used by ActivityManager into this package

2009-12-04 16:36:17 -08:00