| commit | c3ce4d6b447fb6631746e3ac7830a68b1bfe8d49 | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Sat Feb 26 13:33:02 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 26 13:33:02 2011 -0800 |
| tree | 12f670ba91b8bded5a0290bdc871564d96be4966 | |
| parent | b2e7977305469d5fd22592d9ad2b845579d095e9 [diff] | |
| parent | 673eb806cbf58f53975a1f1d58d53d870e079965 [diff] |
am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure() * commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a': DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()