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