commit | 9f734957142805c0b595491369f1639afd4c9ac5 | [log] [tgz] |
---|---|---|
author | Dianne Hackborn <hackbod@google.com> | Tue Apr 13 17:57:23 2010 -0700 |
committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Apr 13 17:57:23 2010 -0700 |
tree | bf6470ab0f985b10c66814f3f7a83e053de43a4d | |
parent | b914ed29c1fe9e6ef31f957b31771d348e3c82cf [diff] | |
parent | e85658ea34ebebd631e8d1ced466188a64f24723 [diff] |
Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo