summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/11/changes
diff options
context:
space:
mode:
authorDianne Hackborn <hackbod@google.com>2012-10-30 16:42:33 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2012-10-30 16:42:33 -0700
commit7913a867a1edf65b438f111ef4becb4a0c597600 (patch)
tree0ebeaa8aef2afc74f7efe24d08b9b5855019e017 /docs/html/sdk/api_diff/11/changes
parente7f1e7fa3a691099b28a51e7825f6e0810b767da (diff)
parent5b285941acf39da30b45c72fb1422cb2c39295ba (diff)
am 5b285941: am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
* commit '5b285941acf39da30b45c72fb1422cb2c39295ba': Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
Diffstat (limited to 'docs/html/sdk/api_diff/11/changes')
0 files changed, 0 insertions, 0 deletions