tree 7ac8c341ea36ca8c5d23419a881c1bb7fef28163
parent 180484115fcf061d6fbb5637d614d7c88d5d8053
parent 38883bdd0088277771efca72c80e33773408d72e
author Daniel Sandler <dsandler@android.com> 1352409229 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352409229 -0800

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.