OSDN Git Service

am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED...
authorCraig Mautner <cmautner@google.com>
Tue, 2 Dec 2014 21:27:23 +0000 (21:27 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 2 Dec 2014 21:27:23 +0000 (21:27 +0000)
commit61a7b7cff57dc66a1f64c9d7519fc1f6844b6915
tree3606959835d55f683ad026eaca8f6370a5ad76ca
parentcc4cd6e1abe81d1edda7f1489dbd26298d38a699
parente4e7d2cdf40407240d63ef4f0a3249e726a1d632
am e4e7d2cd: am 41ec0400: Merge "Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED" into lmp-mr1-dev

* commit 'e4e7d2cdf40407240d63ef4f0a3249e726a1d632':
  Dismiss insecure keyguards if FLAG_SHOW_WHEN_LOCKED
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java