| commit | 673eb806cbf58f53975a1f1d58d53d870e079965 | [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 | 2de34eaf949bd30904e7e7343a64fce86fec4561 | |
| parent | 4337714147521b026ed09d8406a907bbcce2a51d [diff] | |
| parent | ebe5114be69f83ced315018b3c151c07824d80b6 [diff] |
am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure() * commit '6aea1154bae3a0935fdb9b09b2d91d9548232eb0': DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()