OSDN Git Service

Merge "Fix 5026428: Rework unlock attempt logic with active DPM to show better messages"
authorJim Miller <jaggies@google.com>
Mon, 22 Aug 2011 20:36:07 +0000 (13:36 -0700)
committerAndroid (Google) Code Review <android-gerrit@google.com>
Mon, 22 Aug 2011 20:36:07 +0000 (13:36 -0700)

Trivial merge