am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()

Browse Source

* commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a':
  DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()

...

This commit is contained in:

Mike Lockwood

2011-02-26 13:33:02 -08:00

committed by Android Git Automerger

parent 5053124827 bbd460d76d

commit 82752ef4f8

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download Patch File Download Diff File Expand all files Collapse all files

Diff Content Not Available