OSDN Git Service

am 6f277195: am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecur...
authorMike Lockwood <lockwood@android.com>
Wed, 2 Dec 2009 19:41:17 +0000 (11:41 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 19:41:17 +0000 (11:41 -0800)
commit6965e466f5feb4d69b8585513d6b605899b74b06
tree2bf207b3d70d70c95023255243b7ea35bfd8df80
parent81c950884faa981214ce7635afe9a65eae468697
parent6f277195b9434c516facd33f684223a7639de0c5
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."