OSDN Git Service

Merge change I46ea3489 into eclair
authorAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Oct 2009 18:03:43 +0000 (14:03 -0400)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Fri, 2 Oct 2009 18:03:43 +0000 (14:03 -0400)
commitdafe18ee8c8d7923580b0d6d03d44ffdb00372e6
tree389ae57d66affb6e69444d1c8b6a537edb095816
parent93303df4771c99d57bcfab47ce4ee2a72e0b7a8b
parenta61344c419edf3469d8739b15702c0dd8107f67f
Merge change I46ea3489 into eclair

* changes:
  Make sure we wake up the screen if the keyguard is not visible when we think it should be.