Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Skip to content
Commit 1ca0cc30 authored by Dan Murphy's avatar Dan Murphy Committed by Android Git Automerger
Browse files

am 3d8bc316: Merge branch \'eclair-plus-aosp\' of... 

am 3d8bc316: Merge branch \'eclair-plus-aosp\' of ssh://android-git.corp.google.com:29418/platform/frameworks/policies/base into eclair-mr2-plus-aosp

Merge commit '3d8bc316ae81b443522c812a896d42fb2978ba3d'

* commit '3d8bc316ae81b443522c812a896d42fb2978ba3d':
  Ignore requests to hide the keyguard if we are in the process of waking up.
parents 57012b42 5d65c087
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment