| commit | 3c85a4e6396dabf7f0061ff2c6e9f9b35793eadd | [log] [tgz] |
|---|---|---|
| author | Mike Lockwood <lockwood@android.com> | Tue Feb 22 13:11:11 2011 -0800 |
| committer | Android (Google) Code Review <android-gerrit@google.com> | Tue Feb 22 13:11:11 2011 -0800 |
| tree | 2bdd9d2f8185ba5ba5eaa8332a91b56e4455be29 | |
| parent | 117549fc785428b4c9307b909a7dc75761b10145 [diff] | |
| parent | 520d8bc1d840966b5519195aaa514597a662c053 [diff] |
Merge "KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()"