| commit | 332e84e14f8926a64958f064c3ed7f5a27432ce2 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Wed Dec 02 11:35:46 2009 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Wed Dec 02 11:35:46 2009 -0800 |
| tree | 131f233acd2afeb1c88af0ff76d76a9e71175b02 | |
| parent | 5d7ed89d30c6be3b643f7363d95cc434248ac7d0 [diff] | |
| parent | 5d258b6b17eb258ca728f27907d0b24697ab72c9 [diff] |
am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag." Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-plus-aosp * commit '15ee33d4d475dc31709808a64120e56d555e992e': Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."