| commit | 990f565ae50a8302d0775f6b08d15fd4122774ea | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Wed Dec 02 11:41:17 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 11:41:17 2009 -0800 |
| tree | 11b60c2aa0e5ccdd02fe71e5306fa44b257f4e2f | |
| parent | cfbd6fd29d70a5df8bddb88368a0dc30203b3912 [diff] | |
| parent | 2f8a5cd29fc93e13ae6dba42db734dd992dcb5d5 [diff] |
am 6f277195: am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag." Merge commit '6f277195b9434c516facd33f684223a7639de0c5' into eclair-mr2-plus-aosp * commit '6f277195b9434c516facd33f684223a7639de0c5': Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."