Merge "Deferring zoom out animation until after snapToPage and animateDragViewToOrigi...

author Winson Chung <winsonc@google.com>

Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)

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

Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)
author Winson Chung <winsonc@google.com>
Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)
committer Android (Google) Code Review <android-gerrit@google.com>
Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)
diff --cc policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java
Simple merge
diff --cc policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java
Simple merge
author	Winson Chung <winsonc@google.com>
	Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)
committer	Android (Google) Code Review <android-gerrit@google.com>
	Tue, 30 Oct 2012 00:53:28 +0000 (17:53 -0700)
		1	2
policy/src/com/android/internal/policy/impl/keyguard/KeyguardViewStateManager.java	patch \|	diff1 \|	diff2 \|	blob \| history
policy/src/com/android/internal/policy/impl/keyguard/KeyguardWidgetPager.java	patch \|	diff1 \|	diff2 \|	blob \| history