am efcb5405: Merge "Fix NPE caused in LauncherViewPropertyAnimator"

* commit 'efcb54052b0c8dfef2fe0251ab9cb5ee7bd5a051':
  Fix NPE caused in LauncherViewPropertyAnimator

src/com/android/launcher2/LauncherViewPropertyAnimator.java

@@ -67,7 +67,9 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi
 
     @Override
     public void cancel() {
-        mViewPropertyAnimator.cancel();
+        if (mViewPropertyAnimator != null) {
+            mViewPropertyAnimator.cancel();
+        }
     }
 
     @Override
@@ -82,7 +84,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi
 
     @Override
     public long getDuration() {
-        return mViewPropertyAnimator.getDuration();
+        return mDuration;
     }
 
     @Override
@@ -92,7 +94,7 @@ public class LauncherViewPropertyAnimator extends Animator implements AnimatorLi
 
     @Override
     public long getStartDelay() {
-        return mViewPropertyAnimator.getStartDelay();
+        return mStartDelay;
     }
 
     @Override