tree 476eeb232246dcf0c39b5689dea8717c6c3e9fde
parent 1e5af1bcfa3d6d3047a1b60b7abfeab6f3e9d81a
parent 0324bb1a9972ec766b65d4b47b9688588633967b
author Craig Mautner <cmautner@google.com> 1384557963 -0800
committer Android Git Automerger <android-git-automerger@android.com> 1384557963 -0800

am 0324bb1a: am 23188c2b: Merge "Restore jankless transition keyguard-to-wallpaper" into klp-dev

* commit '0324bb1a9972ec766b65d4b47b9688588633967b':
  Restore jankless transition keyguard-to-wallpaper