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