OSDN Git Service

Merge "Handling popups correctly for face unlock" into jb-mr1-lockscreen-dev
authorDanielle Millett <dmillett@google.com>
Tue, 23 Oct 2012 22:42:22 +0000 (15:42 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Tue, 23 Oct 2012 22:42:22 +0000 (15:42 -0700)

Trivial merge