| commit | f46071724b992807d7c58c97b85cb6d4c044db75 | [log] [tgz] |
|---|---|---|
| author | Mike Cleron <mcleron@google.com> | Fri Oct 12 11:10:29 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Fri Oct 12 11:10:29 2012 -0700 |
| tree | 4c6d118674d916c95e50b42bd7c17dca9eae6c60 | |
| parent | dc255e433f42939b0c8178ae80f2048c0c4f52ce [diff] | |
| parent | 732d88e14e4418feba1b80cf1d6010cddb1d5de5 [diff] |
am 732d88e1: Merge "Change keyguard to use single-stage unlock." into jb-mr1-dev * commit '732d88e14e4418feba1b80cf1d6010cddb1d5de5': Change keyguard to use single-stage unlock.