tree 615d34830f1848d1953c35f115672433312f734a
parent 34920823fcd8caff517a32c7aff2c080bfa4835a
parent 061b4fae3daf40c90b46e16b12e7f22142eb498c
author Jim Miller <jaggies@google.com> 1352419083 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1352419083 -0800

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

* commit '061b4fae3daf40c90b46e16b12e7f22142eb498c':
  Add mechanism to kick keyguard to show the assistant