summaryrefslogtreecommitdiff
path: root/docs/html/sdk/api_diff/6
diff options
context:
space:
mode:
authorCraig Mautner <cmautner@google.com>2013-10-11 21:56:55 -0700
committerAndroid Git Automerger <android-git-automerger@android.com>2013-10-11 21:56:55 -0700
commit2c1934d302730bf4dc9190bc600bee180067df3b (patch)
treee70696d2a374714aac515eb2e575cc4f1249b62a /docs/html/sdk/api_diff/6
parent09abd164e722dfc03dad48106a557217563d3b21 (diff)
parent5a7831733be2040fde78027fe2f7eca4f4cc2e28 (diff)
am 5a783173: Merge "Test for hidden keyguard before waiting for it." into klp-dev
* commit '5a7831733be2040fde78027fe2f7eca4f4cc2e28': Test for hidden keyguard before waiting for it.
Diffstat (limited to 'docs/html/sdk/api_diff/6')
0 files changed, 0 insertions, 0 deletions