summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/5/changes
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-10-30 16:39:54 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-30 16:39:54 -0700
commita56395da5df55cf030f20c5cfdc23e3a540540ab (patch)
tree1620d9caa2b550f87c40d7a46a3a7909ef93c578 /docs/html/sdk/api_diff/5/changes
parent33384ed696927efac8d3c495d5446e0f0bd73995 (diff)
parent7710199376657415e5341f64a830aa50fcb117aa (diff)
am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
* commit '7710199376657415e5341f64a830aa50fcb117aa': Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
Diffstat (limited to 'docs/html/sdk/api_diff/5/changes')
0 files changed, 0 insertions, 0 deletions