Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit fbd22f07 authored by Dianne Hackborn's avatar Dianne Hackborn Committed by Android Git Automerger
Browse files

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

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

Merge commit 'ae8c2c71' into froyo-plus-aosp

* commit 'ae8c2c71':
  Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...
parents 53a37509 ae8c2c71
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment