tree decc0b5c7589946beec78c23d9afc0e5c77432e0
parent 604099d5d826a90d513ceb46d77b3701ac7cddc9
parent 178ede8b23633d3144faa429dd098b755f6c7663
author Chiao Cheng <chiaocheng@google.com> 1384472684 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384472684 -0800

am fa7dd751: am 59517317: Merge "Add logic to dynamic dismiss keyguard." into klp-dev

* commit 'fa7dd7517d9330abb0750763b6466f2bfa536243':
  Add logic to dynamic dismiss keyguard.