Merge branch \\'ub-launcher3-burnaby-nyc\\' into nyc-dev b/29535844 am: 3c0c2c4b02
am: 027594fc1b

Change-Id: Ic10773833d1aac1a94bb5af58c7a6f92c815bfd6
diff --git a/src/com/android/launcher3/Folder.java b/src/com/android/launcher3/Folder.java
index b43d965..a426215 100644
--- a/src/com/android/launcher3/Folder.java
+++ b/src/com/android/launcher3/Folder.java
@@ -536,7 +536,7 @@
                 @Override
                 public void run() {
                     mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
-                    mContentWrapper.setLayerType(LAYER_TYPE_NONE, null);
+                    mFooter.setLayerType(LAYER_TYPE_NONE, null);
                 }
             };
         }