tree b5d6bf63b7858eac1d673b52e6c84cc389036f9e
parent fa796912095bbfbb63aad9105ccfbc6cd3b00b3b
parent 32909b4a448dd157c73588cfd8b5bf1cc3cb0230
author Jorim Jaggi <jjaggi@google.com> 1437434774 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1437434774 +0000

am 32909b4a: am 918ca968: am 7800a1f8: am 86b273f1: Fix jank in swipe-up to unlock

* commit '32909b4a448dd157c73588cfd8b5bf1cc3cb0230':
  Fix jank in swipe-up to unlock