OSDN Git Service

am 7913a867: am 5b285941: am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS...
authorDianne Hackborn <hackbod@google.com>
Tue, 30 Oct 2012 23:45:07 +0000 (16:45 -0700)
committerAndroid Git Automerger <android-git-automerger@android.com>
Tue, 30 Oct 2012 23:45:07 +0000 (16:45 -0700)
commit3b8ee1686be368867843b9395152573c9905db5f
treec7573d9565aedc9245597449f13db23235b4abbb
parent5e16403f57fe551169a3755ad96c46faddc5a9fc
parent7913a867a1edf65b438f111ef4becb4a0c597600
am 7913a867: am 5b285941: am 77101993: Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev

* commit '7913a867a1edf65b438f111ef4becb4a0c597600':
  Bring up unlock screen for FLAG_DISMISS_KEYGUARD.
policy/src/com/android/internal/policy/impl/PhoneWindowManager.java