OSDN Git Service

(root) / android-x86 / frameworks-policies-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 81c9508 6f27719)
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)
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."


Trivial merge
frameworks/policies/base
About OSDN
Find Software
Develop Software
Help