| commit | a39c5c369af24cc25f77b9ac97dfffae41c73eb6 | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Oct 04 18:03:36 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 18:03:36 2012 -0700 |
| tree | 0ac8f8991f652ec1691dd62364a611d6918c39b3 | |
| parent | 0f300c7045f150722532fd50dd78f6fcb4c4f395 [diff] | |
| parent | 327424d69b99213e872e91f05feba2d0a137d6c7 [diff] |
am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev * commit '327424d69b99213e872e91f05feba2d0a137d6c7': Plumbing to allow keyguard to be shown with user switcher (issue 7175023)