| commit | 8d62faea22e8974d72cd98dd7cd3f919504d7123 | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Nov 08 15:47:33 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 15:47:33 2012 -0800 |
| tree | fa5de266f0d8ea2f33d0e059e00998ed0c4288d3 | |
| parent | 2a1e6a69a7713d588769693df96a7b8f2a6438c3 [diff] | |
| parent | c4639949d20077a58f92e675b16d45dabf964b0c [diff] |
am c4639949: am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev * commit 'c4639949d20077a58f92e675b16d45dabf964b0c': Only show the bouncer for the assistant if secure.