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