| commit | acb535a7a5c97120bd5407a6b19d5a7d3e8db3b7 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Sat Feb 26 13:33:12 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 26 13:33:12 2011 -0800 |
| tree | cc9da8d17c584a6d624facd8165dc633803bfaba | |
| parent | 82752ef4f857c1911028d075b4313ecd3bebaf27 [diff] | |
| parent | 1b8956398be6aeacf0383d8e0931771dbd3a6d2b [diff] |
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()