tree bf6470ab0f985b10c66814f3f7a83e053de43a4d
parent b914ed29c1fe9e6ef31f957b31771d348e3c82cf
parent e85658ea34ebebd631e8d1ced466188a64f24723
author Dianne Hackborn <hackbod@google.com> 1271206643 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1271206643 -0700

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