| commit | c4639949d20077a58f92e675b16d45dabf964b0c | [log] [tgz] |
|---|---|---|
| author | Daniel Sandler <dsandler@android.com> | Thu Nov 08 13:13:49 2012 -0800 |
| committer | Android Git Automerger <android-git-automerger@android.com> | Thu Nov 08 13:13:49 2012 -0800 |
| tree | 7ac8c341ea36ca8c5d23419a881c1bb7fef28163 | |
| parent | 180484115fcf061d6fbb5637d614d7c88d5d8053 [diff] | |
| parent | 38883bdd0088277771efca72c80e33773408d72e [diff] |
am 38883bdd: am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev * commit '38883bdd0088277771efca72c80e33773408d72e': Only show the bouncer for the assistant if secure.