From: Mike Lockwood <lockwood@android.com>
Date: Wed, 2 Dec 2009 19:35:46 +0000 (-0800)
Subject: am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and... 
X-Git-Tag: android-x86-2.2~14^2~15
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=19348e9af62db92494e5fffe238b4012f64ea26a;p=android-x86%2Fframeworks-policies-base.git

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."
---

19348e9af62db92494e5fffe238b4012f64ea26a