tree a1f5a75077438bbcb56c7a7154ba40539106ad0d
parent d199c8f8aac8fa51ab727c46f13d3cf378a5e7b5
parent e2bcc72e6ed541b4dfb9865bc1195e9cd20807c6
author Mike Lockwood <lockwood@android.com> 1258739346 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1258739346 -0800

am 4ed2e2d4: am 6b72e9b3: When keyguard is active, only allow the status bar to be opened if it is insecure and covered by another window.

Merge commit '4ed2e2d4cb592aa49fce46b035e85aa14f1f989e'

* commit '4ed2e2d4cb592aa49fce46b035e85aa14f1f989e':
  When keyguard is active, only allow the status bar to be opened if it is insecure and covered by another window.