OSDN Git Service

am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on...
authorCraig Mautner <cmautner@google.com>
Sat, 8 Mar 2014 01:55:33 +0000 (01:55 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Sat, 8 Mar 2014 01:55:33 +0000 (01:55 +0000)
commit508e88e329cd157c3de94ccbac7374038f7e2355
tree5bfa7c7379d56fa6ae93c5f54ffe8643b6112f43
parentb559b37150d24411f0b5ef102ced8d5acf858a0e
parent9bf7f893e0833fca9b240c11b98d6d7dc1892081
am 9bf7f893: (-s ours) am 93df07a1: Merge "Show the keyguard if unsecure window on top. DO NOT MERGE." into klp-dev

* commit '9bf7f893e0833fca9b240c11b98d6d7dc1892081':
  Show the keyguard if unsecure window on top. DO NOT MERGE.