OSDN Git Service

Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev
authorDianne Hackborn <hackbod@google.com>
Tue, 30 Oct 2012 23:37:18 +0000 (16:37 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 30 Oct 2012 23:37:19 +0000 (16:37 -0700)
commit7710199376657415e5341f64a830aa50fcb117aa
tree4a4b95c661c3f9a1bb4d0bfe4b17629d84079692
parentac14efce4b9575ac1de567073d7088162d4d2eed
parentad09bccfe4cc0a3075e97c0911a02b329023a34a
Merge "Bring up unlock screen for FLAG_DISMISS_KEYGUARD." into jb-mr1-dev