tree 6ff5aa54451c772965985395ec17b0a400270802
parent 79b08a499f5ac7aa4f9dcba4e6c5d9a54463799b
parent 2c29deaa2650091d9206b8fa93f8a447ee247d52
author Jim Miller <jaggies@google.com> 1352409203 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352409203 -0800

am 2c29deaa: am 6be441c5: Merge "Add mechanism to kick keyguard to show the assistant" into jb-mr1-lockscreen-dev

* commit '2c29deaa2650091d9206b8fa93f8a447ee247d52':
  Add mechanism to kick keyguard to show the assistant