Merge "Re-enable transition animation between face unlock and backup" into jb-mr1...

author Jim Miller <jaggies@google.com>

Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)

committer Android (Google) Code Review <android-gerrit@google.com>

Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)
author Jim Miller <jaggies@google.com>
Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)
diff --cc policy/src/com/android/internal/policy/impl/keyguard/KeyguardHostView.java
Simple merge
author	Jim Miller <jaggies@google.com>
	Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Wed, 31 Oct 2012 03:43:52 +0000 (20:43 -0700)