summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/15/changes
diff options
context:
space:
mode:
authorMike Lockwood <lockwood@android.com>2011-02-26 13:33:02 -0800
committerAndroid Git Automerger <android-git-automerger@android.com>2011-02-26 13:33:02 -0800
commit82752ef4f857c1911028d075b4313ecd3bebaf27 (patch)
treecc9da8d17c584a6d624facd8165dc633803bfaba /docs/html/sdk/api_diff/15/changes
parent505312482782a600e997c91712f03f83c7a70428 (diff)
parentbbd460d76dc69eca9a14ab1127b95a55429f460a (diff)
am bbd460d7: (-s ours) am 6aea1154: DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
* commit 'bbd460d76dc69eca9a14ab1127b95a55429f460a': DO NOT MERGE: KeyguardManager: Add isKeyguardLocked() and isKeyguardSecure()
Diffstat (limited to 'docs/html/sdk/api_diff/15/changes')
0 files changed, 0 insertions, 0 deletions