OSDN Git Service

am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste...
authorMike Lockwood <lockwood@android.com>
Sat, 26 Feb 2011 21:33:12 +0000 (13:33 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 26 Feb 2011 21:33:12 +0000 (13:33 -0800)
* commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()


Trivial merge