OSDN Git Service

(root) / android-x86 / frameworks-policies-base.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 23ac9da 15ee33d)
am 15ee33d4: Revert "Fix problems with KeyguardManager.exitKeyguardSecurely() and...
authorMike Lockwood <lockwood@android.com>
Wed, 2 Dec 2009 19:35:46 +0000 (11:35 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Wed, 2 Dec 2009 19:35:46 +0000 (11:35 -0800)
Merge commit '15ee33d4d475dc31709808a64120e56d555e992e' into eclair-plus-aosp

* commit '15ee33d4d475dc31709808a64120e56d555e992e':
  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