| commit | 451d49b34c8399a3479ca96addcc11857b6afb3e | [log] [tgz] |
|---|---|---|
| author | Adam Cohen <adamcohen@google.com> | Thu Oct 04 18:05:48 2012 -0700 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Oct 04 18:05:48 2012 -0700 |
| tree | 4c5d9f65392e664f0f5856fc81319082bdea4c35 | |
| parent | 4280233813c22663d3e9d100cac70eaccd0d2afc [diff] | |
| parent | a39c5c369af24cc25f77b9ac97dfffae41c73eb6 [diff] |
am a39c5c36: am 327424d6: Merge "Plumbing to allow keyguard to be shown with user switcher (issue 7175023)" into jb-mr1-dev * commit 'a39c5c369af24cc25f77b9ac97dfffae41c73eb6': Plumbing to allow keyguard to be shown with user switcher (issue 7175023)