From: Mike Lockwood <lockwood@android.com>
Date: Sat, 26 Feb 2011 21:33:12 +0000 (-0800)
Subject: am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste... 
X-Git-Tag: android-x86-4.4-r1~8669
X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=70e3799cc0bc766f4e94731830f7b7a8d74c39f8;p=android-x86%2Fframeworks-native.git

am 1b895639: (-s ours) am 69e19ae1: DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()

* commit '1b8956398be6aeacf0383d8e0931771dbd3a6d2b':
  DO NOT MERGE: KeyguardManager: Fix copy & paste error in isKeyguardLocked()
---

70e3799cc0bc766f4e94731830f7b7a8d74c39f8