tree ba0555f2861ccb3d8581790f1a58d5d9dd4e6e93
parent 13b27810f990ea57decfcde98ddd461b8c0b9936
parent 44f60cca7bb31e2f9b4b7bf25bb2e0cfb0e3e1e1
author Jorim Jaggi <jjaggi@google.com> 1415807255 +0000
committer Android (Google) Code Review <android-gerrit@google.com> 1415807258 +0000

Merge "Fix lockscreen launch animations once and for all" into lmp-mr1-dev