OSDN Git Service

am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and...
authorMike Lockwood <lockwood@android.com>
Wed, 2 Dec 2009 19:36:05 +0000 (11:36 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 19:36:05 +0000 (11:36 -0800)
commit6f277195b9434c516facd33f684223a7639de0c5
tree2bf207b3d70d70c95023255243b7ea35bfd8df80
parent70d1fe383e3f023e71889345ffd9b2fa921495b4
parent15ee33d4d475dc31709808a64120e56d555e992e
am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."

Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-mr2

* commit '15ee33d4d475dc31709808a64120e56d555e992e':
  Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and the FLAG_SHOW_WHEN_LOCKED window manager flag."
phone/com/android/internal/policy/impl/KeyguardViewMediator.java