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)

Trivial merge