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