Dianne Hackborn b7d9e8e17b am fbd22f07: am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo ...

Merge commit 'fbd22f072b48be4b465085fb5354890e2f10fd32' into kraken

* commit 'fbd22f072b48be4b465085fb5354890e2f10fd32':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...

2010-04-13 18:02:11 -07:00

..

com/android/server

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

2010-04-13 18:02:11 -07:00

Android.mk

move event log tags used by ActivityManager into this package

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