OSDN Git Service

am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1...
authorDaniel Sandler <dsandler@android.com>
Thu, 8 Nov 2012 21:09:05 +0000 (13:09 -0800)
committerAndroid Git Automerger <android-git-automerger@android.com>
Thu, 8 Nov 2012 21:09:05 +0000 (13:09 -0800)
commit38883bdd0088277771efca72c80e33773408d72e
tree5ea6e0780bfd44f987b8cb37c1647915107e8ad6
parentf6b6462f277689b7bb6b1f66cb5b57f30d1e194c
parent4eada64770bc2f021cb04cbb77efbad1c9a7adc4
am 4eada647: Merge "Only show the bouncer for the assistant if secure." into jb-mr1-lockscreen-dev

* commit '4eada64770bc2f021cb04cbb77efbad1c9a7adc4':
  Only show the bouncer for the assistant if secure.