am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face...
am 2bf287c8: am 162fc8e6: Merge "Re-enable transition animation between face unlock and backup" into jb-mr1-lockscreen-dev
* commit '2bf287c8':
Re-enable transition animation between face unlock and backup