Commits
Daniel Sandler authored and Android Git Automerger committed c4639949d20M
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.
Showing diff to180484115fc