OSDN Git Service

am 1615d63b: If a window specifies flag to show even when screen is locked, the keygu...
authorSuchi Amalapurapu <asuchitra@google.com>
Mon, 18 May 2009 20:44:38 +0000 (13:44 -0700)
committerThe Android Open Source Project <initial-contribution@android.com>
Mon, 18 May 2009 20:44:38 +0000 (13:44 -0700)
Merge commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021'

* commit '1615d63b8fd58d1e8d19207ffb0aeccf09840021':
  If a window specifies flag to show even when screen is locked, the keyguard is hidden and conversely if the keyguard has been hidden


Trivial merge