tree 0fcd7c327c386a2ee460f24c6d01d93b401dfb2c
parent fda5336c2f5b350a42bd153d08be439eb6436017
parent d04f864cae1ae553398774692effb663b73f902c
author Jorim Jaggi <jjaggi@google.com> 1415807744 +0000
committer Android Git Automerger <android-git-automerger@android.com> 1415807744 +0000

am d04f864c: am b9eedce2: Merge "Fix lockscreen launch animations once and for all" into lmp-mr1-dev

* commit 'd04f864cae1ae553398774692effb663b73f902c':
  Fix lockscreen launch animations once and for all