OSDN Git Service

am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to...
authorCraig Mautner <cmautner@google.com>
Tue, 1 Apr 2014 21:56:55 +0000 (21:56 +0000)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 1 Apr 2014 21:56:55 +0000 (21:56 +0000)
commitffb22827d74fcb7872a912ca022800a9b0818695
tree26109baddb31c97a6d2466bf32d8115f82e1cc7b
parent2c73e08d36985fbe5aa8b845730eeec8fe4379b1
parent2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6
am 2b6fe299: am c70f15fe: am 2fc798a2: resolved conflicts for merge of 8c6e6e73 to klp-dev

* commit '2b6fe2990de78cfb64a27c19e5351cffe3ccb7d6':
  Fix FLAG_DISMISS_KEYGUARD not working
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java