tree 5887571047437408bcb71e08da357b33d6a2bb39
parent 666eb122fd22147b99845c53707cb091dcff00ed
parent 4f36995777a4136e8e63ea51cef2ff61df48790d
author Jim Miller <jaggies@google.com> 1314045367 -0700
committer Android (Google) Code Review <android-gerrit@google.com> 1314045367 -0700

Merge "Fix 5026428: Rework unlock attempt logic with active DPM to show better messages"