| commit | bbd460d76dc69eca9a14ab1127b95a55429f460a | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Sat Feb 26 13:21:05 2011 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Sat Feb 26 13:21:05 2011 -0800 |
| tree | f3f181780e271904f5a91f35284a8c33a9fdaa7d | |
| parent | cd6828e84220c6bdf92bbca12fcd88a8da76387c [diff] | |
| parent | 6aea1154bae3a0935fdb9b09b2d91d9548232eb0 [diff] |
am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure() * commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0': DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()