tree 2bdd9d2f8185ba5ba5eaa8332a91b56e4455be29
parent 117549fc785428b4c9307b909a7dc75761b10145
parent 520d8bc1d840966b5519195aaa514597a662c053
author Mike Lockwood <lockwood@android.com> 1298409071 -0800
committer Android (Google) Code Review <android-gerrit@google.com> 1298409071 -0800

Merge "KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()"