| commit | b63b48b407b91df173837a5ef6ae71e3bac47ac8 | [log] [tgz] |
|---|---|---|
| author | Jim Miller <jaggies@google.com> | Mon Aug 22 13:38:20 2011 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Mon Aug 22 13:38:20 2011 -0700 |
| tree | d0c6a056b385517881ba9f6642fab796795d5ee1 | |
| parent | a8b2a1b0d56623f3b5c57e25e405882a7996ebfc [diff] | |
| parent | 5e82bc038385edcb669b44659401fb83dab9c880 [diff] |
am 5e82bc03: Merge "Fix 5026428: Rework unlock attempt logic with active DPM to show better messages" * commit '5e82bc038385edcb669b44659401fb83dab9c880': Fix 5026428: Rework unlock attempt logic with active DPM to show better messages