| commit | fbd22f072b48be4b465085fb5354890e2f10fd32 | [log] [tgz] |
|---|---|---|
| author | Dianne Hackborn <hackbod@google.com> | Tue Apr 13 17:59:56 2010 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Tue Apr 13 17:59:56 2010 -0700 |
| tree | 3fb2ee3cb7d3f079e5b220b67883efbac5979402 | |
| parent | 53a37509c3a9301423ee6ec47c71bcea47e46d9c [diff] | |
| parent | ae8c2c71f7791ed0321e56f31f0c1276da4d8842 [diff] |
am ae8c2c71: Merge "Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard..." into froyo Merge commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842' into froyo-plus-aosp * commit 'ae8c2c71f7791ed0321e56f31f0c1276da4d8842': Fix issue #2420340: if FLAG_SHOW_WHEN_LOCKED, do not show keyguard...