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