Dianne Hackborn ae8c2c71f7 Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo

2010-04-13 17:57:23 -07:00

..

com/android/server

Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo

2010-04-13 17:57:23 -07:00

Android.mk

move event log tags used by ActivityManager into this package

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